diff --git a/HellionChat/FontManager.cs b/HellionChat/FontManager.cs
index 6a60292..a252184 100644
--- a/HellionChat/FontManager.cs
+++ b/HellionChat/FontManager.cs
@@ -61,7 +61,7 @@ public sealed class FontManager : IDisposable
     // widget gallery exposes it.
     internal static float SenderWeight = 1.3f;
 
-    // Wired post-build (B4b-3); a Func keeps FontManager off the theme layer.
+    // Wired post-build; a Func keeps FontManager off the theme layer.
     private Func<ThemeTypography?>? _typographySource;
 
     // Lets RebuildDelegateFontsIfChanged skip rebuilds when the size is unchanged.
diff --git a/HellionChat/Infrastructure/Hosting/InitHostedServices.cs b/HellionChat/Infrastructure/Hosting/InitHostedServices.cs
index 4f225d7..c7a54eb 100644
--- a/HellionChat/Infrastructure/Hosting/InitHostedServices.cs
+++ b/HellionChat/Infrastructure/Hosting/InitHostedServices.cs
@@ -29,7 +29,7 @@ internal sealed class ThemeRegistryInitHostedService(
         foreach (var _ in registry.AllCustom()) { }
         registry.SwitchSilent(Plugin.Config.Theme);
 
-        // B4b-3: point font sizes at the active theme's typography, wire future
+        // Point font sizes at the active theme's typography, wire future
         // theme switches to the atlas rebuild, and apply the boot theme's override.
         fontManager.SetTypographySource(() => registry.Active.Typography);
         registry.SetActiveChangedCallback(() => fontManager.RebuildDelegateFontsIfChanged());
diff --git a/HellionChat/SelfTests/PerformanceBaselineStep.cs b/HellionChat/SelfTests/PerformanceBaselineStep.cs
index f075905..757ea32 100644
--- a/HellionChat/SelfTests/PerformanceBaselineStep.cs
+++ b/HellionChat/SelfTests/PerformanceBaselineStep.cs
@@ -4,7 +4,7 @@ using Dalamud.Plugin.SelfTest;
 namespace HellionChat.SelfTests;
 
 // Optional metric capture. Accumulates 1000 steady-state frames of ImGui IO
-// counters plus the plugin's full-Draw wall-time (Plugin.LastDrawMs, B5-1),
+// counters plus the plugin's full-Draw wall-time (Plugin.LastDrawMs),
 // then writes a single perf-baseline.json into the plugin ConfigDirectory so
 // the cycle-notes author can copy the baseline figures without a separate
 // profiling harness. The step only records — it never fails on a threshold
diff --git a/HellionChat/Themes/ThemeJsonLoader.cs b/HellionChat/Themes/ThemeJsonLoader.cs
index b61db75..a01ee95 100644
--- a/HellionChat/Themes/ThemeJsonLoader.cs
+++ b/HellionChat/Themes/ThemeJsonLoader.cs
@@ -13,7 +13,7 @@ internal static class ThemeJsonLoader
     // policy from the v2.x style refactor: v1 user themes are not migrated,
     // they're silently ignored so the loader stays free of legacy mapping
     // code. Any other malformed input still throws FormatException.
-    // B4b-2: callers must pass the logger or the default-fill warnings go silent.
+    // Callers must pass the logger or the default-fill warnings go silent.
     public static Theme? LoadFromString(string json, ILogger? logger = null)
     {
         if (string.IsNullOrWhiteSpace(json))
diff --git a/HellionChat/Ui/Components/TopTabBar.cs b/HellionChat/Ui/Components/TopTabBar.cs
index afa7100..8b8f637 100644
--- a/HellionChat/Ui/Components/TopTabBar.cs
+++ b/HellionChat/Ui/Components/TopTabBar.cs
@@ -52,7 +52,7 @@ internal sealed class TopTabBar
         for (var i = 0; i < tabs.Count; i++)
         {
             var tab = tabs[i];
-            // POP-1b: a popped-out tab is owned by its pop-out window, not the main
+            // A popped-out tab is owned by its pop-out window, not the main
             // strip (1.5.6 exclusivity). Gate on the pool, not Tab.PopOut (stale flag).
             if (_pool.IsOpen(tab.Identifier))
                 continue;
diff --git a/HellionChat/Ui/Windows/ChannelPopoutWindow.cs b/HellionChat/Ui/Windows/ChannelPopoutWindow.cs
index 9075f4a..a930d9a 100644
--- a/HellionChat/Ui/Windows/ChannelPopoutWindow.cs
+++ b/HellionChat/Ui/Windows/ChannelPopoutWindow.cs
@@ -155,7 +155,7 @@ internal sealed class ChannelPopoutWindow : Window, IFocusableChatWindow
         if (Bound is null)
             return;
 
-        // POP-1f: the bound tab is live-visible in this pop-out, so it carries no
+        // The bound tab is live-visible in this pop-out, so it carries no
         // unread badge — mirror MainWindow's per-frame zero for the active tab.
         // View-state reset only (tab.Messages store is untouched).
         Bound.Unread = 0;
diff --git a/HellionChat/Ui/Windows/MainWindow.cs b/HellionChat/Ui/Windows/MainWindow.cs
index fa6996e..1afff71 100644
--- a/HellionChat/Ui/Windows/MainWindow.cs
+++ b/HellionChat/Ui/Windows/MainWindow.cs
@@ -310,9 +310,9 @@ internal sealed class MainWindow : Window, IFocusableChatWindow
                 TabLifecycleHelpers.OnTabActivated(reseed, active);
         }
 
-        // POP-1c: a popped-out tab must not stay the main window's active surface
+        // A popped-out tab must not stay the main window's active surface
         // (1.5.6 exclusivity). Re-anchor to the first non-popped tab the moment the
-        // active one is popped; null when every tab is popped (POP-1d guards Draw).
+        // active one is popped; null when every tab is popped, which Draw guards for.
         // Runs post-seed, before the sidebar/top-tab draw, so the popped tab never
         // renders. Idempotent: PickMainActiveTab returns the same reference once
         // settled, so OnTabActivated fires only on the pop frame.
diff --git a/HellionChat/Util/TabLifecycleHelpers.cs b/HellionChat/Util/TabLifecycleHelpers.cs
index 998b5c3..a5a8b26 100644
--- a/HellionChat/Util/TabLifecycleHelpers.cs
+++ b/HellionChat/Util/TabLifecycleHelpers.cs
@@ -165,7 +165,7 @@ internal static class TabLifecycleHelpers
 
     // Sectioned sidebar render order (1.5.6 parity): persistent → pinned TempTabs →
     // unpinned TempTabs. Returns indices into the live tab list so the list order is
-    // never mutated and DrawRow keeps each tab's ORIGINAL index for PushID. POP-1a:
+    // never mutated and DrawRow keeps each tab's ORIGINAL index for PushID.
     // isPoppedOut excludes tabs bound to a pop-out window — an excluded tab draws no
     // row and its pool's section header gates on the first tab actually reached. Pure
     // + Dalamud-free so the Build-Suite can pin it.
@@ -215,7 +215,7 @@ internal static class TabLifecycleHelpers
         return persistent;
     }
 
-    // POP-1c: returns the tab the main window should display — the current tab if it
+    // Returns the tab the main window should display — the current tab if it
     // is not popped out, else the FIRST non-popped tab in list order, else null when
     // every tab is popped. NOTE: deliberately NOT ResetActiveTabIfRemoved's
     // unconditional Tabs[0] — Tabs[0] may itself be popped and would re-trigger the
@@ -243,7 +243,7 @@ internal static class TabLifecycleHelpers
         Popout,
     }
 
-    // POP-1f: the alreadyPopped case is the whole reason this is a function.
+    // The alreadyPopped case is the whole reason this is a function.
     //
     // Revealing a popped-out tab in the main window looks like it does nothing,
     // and then does something worse: PickMainActiveTab re-anchors on the next
@@ -268,12 +268,12 @@ internal static class TabLifecycleHelpers
             _ => switchAlways && !alreadyPopped ? TellReveal.MainWindow : TellReveal.None,
         };
 
-    // POP-1e: popout-aware sibling of WrapTabIndex for the ChatTabForward/Backward
+    // Popout-aware sibling of WrapTabIndex for the ChatTabForward/Backward
     // keybind. Steps from current by delta's sign (±1), wrapping, and returns the
     // first index whose tab is NOT popped out within tabs.Count steps; returns current
     // when every other tab is popped (no-op), the list is empty, or a single tab.
-    // Skipping popped tabs here is what stops the POP-1c re-anchor from making the
-    // cycle stick (CYCLE-1). Pure + Dalamud-free.
+    // Skipping popped tabs here is what stops the PickMainActiveTab re-anchor
+    // from making the cycle stick. Pure + Dalamud-free.
     // TEST-MIRROR: ../../../Hellion Build test/_Helpers/NextMainTabIndexTests.cs
     internal static int NextMainTabIndex(
         int current,