diff --git a/lib/microwaveprop/accounts.ex b/lib/microwaveprop/accounts.ex
index 2fc92562..a846b720 100644
--- a/lib/microwaveprop/accounts.ex
+++ b/lib/microwaveprop/accounts.ex
@@ -67,8 +67,12 @@ defmodule Microwaveprop.Accounts do
   """
   @spec get_user_by_email_and_password(String.t(), String.t()) :: User.t() | nil
   def get_user_by_email_and_password(email, password) when is_binary(email) and is_binary(password) do
-    user = Repo.get_by(User, email: email)
-    if User.valid_password?(user, password), do: user
+    with %User{} = user <- Repo.get_by(User, email: email),
+         true <- User.valid_password?(user, password) do
+      user
+    else
+      _ -> nil
+    end
   end
 
   @doc """
@@ -443,15 +447,9 @@ defmodule Microwaveprop.Accounts do
   @spec create_api_token(User.t(), map()) ::
           {:ok, {String.t(), UserApiToken.t()}} | {:error, Ecto.Changeset.t()}
   def create_api_token(%User{} = user, attrs) do
-    case UserApiToken.build(user, attrs) do
-      {:ok, {plaintext, changeset}} ->
-        case Repo.insert(changeset) do
-          {:ok, record} -> {:ok, {plaintext, record}}
-          {:error, changeset} -> {:error, changeset}
-        end
-
-      {:error, changeset} ->
-        {:error, changeset}
+    with {:ok, {plaintext, changeset}} <- UserApiToken.build(user, attrs),
+         {:ok, record} <- Repo.insert(changeset) do
+      {:ok, {plaintext, record}}
     end
   end
 
diff --git a/lib/microwaveprop_web/live/map_live.ex b/lib/microwaveprop_web/live/map_live.ex
index a0e8754e..5939e3a0 100644
--- a/lib/microwaveprop_web/live/map_live.ex
+++ b/lib/microwaveprop_web/live/map_live.ex
@@ -36,13 +36,7 @@ defmodule MicrowavepropWeb.MapLive do
 
   @impl true
   def mount(params, session, socket) do
-    _ =
-      if connected?(socket) do
-        :ok = Phoenix.PubSub.subscribe(Microwaveprop.PubSub, "propagation:updated")
-        :ok = Phoenix.PubSub.subscribe(Microwaveprop.PubSub, "propagation:pipeline")
-        _ = Process.send_after(self(), :refresh_pipeline_status, @pipeline_status_refresh_ms)
-        _ = Process.send_after(self(), :advance_now_cursor, @advance_now_cursor_ms)
-      end
+    socket = subscribe_if_connected(socket)
 
     socket =
       socket
@@ -97,6 +91,17 @@ defmodule MicrowavepropWeb.MapLive do
      )}
   end
 
+  defp subscribe_if_connected(socket) do
+    if connected?(socket) do
+      :ok = Phoenix.PubSub.subscribe(Microwaveprop.PubSub, "propagation:updated")
+      :ok = Phoenix.PubSub.subscribe(Microwaveprop.PubSub, "propagation:pipeline")
+      _ = Process.send_after(self(), :refresh_pipeline_status, @pipeline_status_refresh_ms)
+      _ = Process.send_after(self(), :advance_now_cursor, @advance_now_cursor_ms)
+    end
+
+    socket
+  end
+
   # Compact relative-time rendering of the build timestamp. Matches the
   # format used by Layouts.deploy_stamp/1 so the nav and the map
   # sidebar stay consistent.
@@ -193,63 +198,22 @@ defmodule MicrowavepropWeb.MapLive do
   end
 
   def handle_event("select_time", %{"time" => time_str}, socket) do
-    # Same as set_selected_time — client owns the score fetch via HTTP.
-    # Kept as a separate event because the click target predates the
-    # split and cleaning every caller up isn't necessary.
-    case DateTime.from_iso8601(time_str) do
-      {:ok, time, _} ->
-        socket =
-          socket
-          |> assign(:selected_time, time)
-          |> assign(:tracking_now?, tracking_now?(time, socket.assigns.valid_times, DateTime.utc_now()))
-          |> patch_map_url()
-
-        {:noreply, socket}
-
-      _ ->
-        {:noreply, socket}
-    end
+    handle_set_time(time_str, socket)
   end
 
   # Fast path: the client already has the preloaded hour's scores in its
   # local cache and only needs the server to remember which time is selected
   # (used later for point_detail and forecast state on reconnect).
   def handle_event("set_selected_time", %{"time" => time_str}, socket) do
-    case DateTime.from_iso8601(time_str) do
-      {:ok, time, _} ->
-        socket =
-          socket
-          |> assign(:selected_time, time)
-          |> assign(:tracking_now?, tracking_now?(time, socket.assigns.valid_times, DateTime.utc_now()))
-          |> patch_map_url()
-
-        {:noreply, socket}
-
-      _ ->
-        {:noreply, socket}
-    end
+    handle_set_time(time_str, socket)
   end
 
   def handle_event("toggle_grid", _params, socket) do
-    visible = !socket.assigns.grid_visible
-
-    socket =
-      socket
-      |> assign(:grid_visible, visible)
-      |> push_event("toggle_grid", %{visible: visible})
-
-    {:noreply, socket}
+    handle_toggle(socket, :grid_visible, "toggle_grid")
   end
 
   def handle_event("toggle_radar", _params, socket) do
-    visible = !socket.assigns.radar_visible
-
-    socket =
-      socket
-      |> assign(:radar_visible, visible)
-      |> push_event("toggle_radar", %{visible: visible})
-
-    {:noreply, socket}
+    handle_toggle(socket, :radar_visible, "toggle_radar")
   end
 
   def handle_event("point_detail", %{"lat" => lat, "lon" => lon}, socket) do
@@ -313,6 +277,29 @@ defmodule MicrowavepropWeb.MapLive do
     {:noreply, socket}
   end
 
+  # -- event handler helpers (grouped after handle_event clauses) --
+
+  defp handle_set_time(time_str, socket) do
+    case DateTime.from_iso8601(time_str) do
+      {:ok, time, _} ->
+        socket =
+          socket
+          |> assign(:selected_time, time)
+          |> assign(:tracking_now?, tracking_now?(time, socket.assigns.valid_times, DateTime.utc_now()))
+          |> patch_map_url()
+
+        {:noreply, socket}
+
+      _ ->
+        {:noreply, socket}
+    end
+  end
+
+  defp handle_toggle(socket, assign_key, event_name) do
+    visible = !socket.assigns[assign_key]
+    {:noreply, socket |> assign(assign_key, visible) |> push_event(event_name, %{visible: visible})}
+  end
+
   @impl true
   def handle_info({:propagation_updated, _valid_times}, socket) do
     band = socket.assigns.selected_band