diff --git a/comtypes/server/register.py b/comtypes/server/register.py
index 541f17d9..472ddb64 100644
--- a/comtypes/server/register.py
+++ b/comtypes/server/register.py
@@ -317,11 +317,8 @@ def _iter_reg_entries(cls: Type, reg_clsid: str) -> Iterator[_Entry]:
     # basic entry - names the comobject
     reg_desc = getattr(cls, "_reg_desc_", "")
     if not reg_desc:
-        # Simple minded algorithm to construct a description from
-        # the progid:
-        reg_desc = getattr(cls, "_reg_novers_progid_", "") or getattr(
-            cls, "_reg_progid_", ""
-        )
+        # Simple minded algorithm to construct a description from the progid:
+        reg_desc = getattr(cls, "_reg_novers_progid_", getattr(cls, "_reg_progid_", ""))
         if reg_desc:
             reg_desc = reg_desc.replace(".", " ")
     yield (HKCR, f"CLSID\\{reg_clsid}", "", reg_desc)
@@ -358,52 +355,69 @@ def _iter_ctx_entries(
     inprocsvr_ctx = bool(clsctx & CLSCTX_INPROC_SERVER)
 
     if localsvr_ctx and frozendllhandle is None:
-        exe = sys.executable
-        if " " in exe:
-            exe = f'"{exe}"'
         if frozen is None:
-            if not __debug__:
-                exe = f"{exe} -O"
-            script = os.path.abspath(sys.modules[cls.__module__].__file__)  # type: ignore
-            if " " in script:
-                script = f'"{script}"'
-            yield (HKCR, rf"CLSID\{reg_clsid}\LocalServer32", "", f"{exe} {script}")
+            yield from _iter_interp_local_ctx_entries(cls, reg_clsid)
         else:
-            yield (HKCR, rf"CLSID\{reg_clsid}\LocalServer32", "", f"{exe}")
+            yield from _iter_frozen_local_ctx_entries(cls, reg_clsid)
+    if inprocsvr_ctx and frozen in (None, "dll"):
+        yield from _iter_inproc_ctx_entries(cls, reg_clsid, frozendllhandle)
+    yield from _iter_tlib_entries(cls, reg_clsid)
+
+
+def _iter_interp_local_ctx_entries(cls: Type, reg_clsid: str) -> Iterator[_Entry]:
+    exe = sys.executable
+    exe = f'"{exe}"' if " " in exe else exe
+    if not __debug__:
+        exe = f"{exe} -O"
+    script = os.path.abspath(sys.modules[cls.__module__].__file__)  # type: ignore
+    if " " in script:
+        script = f'"{script}"'
+    yield (HKCR, rf"CLSID\{reg_clsid}\LocalServer32", "", f"{exe} {script}")
+
+
+def _iter_frozen_local_ctx_entries(cls: Type, reg_clsid: str) -> Iterator[_Entry]:
+    exe = sys.executable
+    exe = f'"{exe}"' if " " in exe else exe
+    yield (HKCR, rf"CLSID\{reg_clsid}\LocalServer32", "", f"{exe}")
+
 
+def _iter_inproc_ctx_entries(
+    cls: Type, reg_clsid: str, frozendllhandle: Optional[int]
+) -> Iterator[_Entry]:
     # Register InprocServer32 only when run from script or from
     # py2exe dll server, not from py2exe exe server.
-    if inprocsvr_ctx and frozen in (None, "dll"):
+    yield (
+        HKCR,
+        rf"CLSID\{reg_clsid}\InprocServer32",
+        "",
+        _get_serverdll(frozendllhandle),
+    )
+    # only for non-frozen inproc servers the PythonPath/PythonClass is needed.
+    if frozendllhandle is None or not _clsid_to_class:
         yield (
             HKCR,
             rf"CLSID\{reg_clsid}\InprocServer32",
-            "",
-            _get_serverdll(frozendllhandle),
+            "PythonClass",
+            _get_full_classname(cls),
+        )
+        yield (
+            HKCR,
+            rf"CLSID\{reg_clsid}\InprocServer32",
+            "PythonPath",
+            _get_pythonpath(cls),
+        )
+
+    reg_threading = getattr(cls, "_reg_threading_", None)
+    if reg_threading is not None:
+        yield (
+            HKCR,
+            rf"CLSID\{reg_clsid}\InprocServer32",
+            "ThreadingModel",
+            reg_threading,
         )
-        # only for non-frozen inproc servers the PythonPath/PythonClass is needed.
-        if frozendllhandle is None or not _clsid_to_class:
-            yield (
-                HKCR,
-                rf"CLSID\{reg_clsid}\InprocServer32",
-                "PythonClass",
-                _get_full_classname(cls),
-            )
-            yield (
-                HKCR,
-                rf"CLSID\{reg_clsid}\InprocServer32",
-                "PythonPath",
-                _get_pythonpath(cls),
-            )
 
-        reg_threading = getattr(cls, "_reg_threading_", None)
-        if reg_threading is not None:
-            yield (
-                HKCR,
-                rf"CLSID\{reg_clsid}\InprocServer32",
-                "ThreadingModel",
-                reg_threading,
-            )
 
+def _iter_tlib_entries(cls: Type, reg_clsid: str) -> Iterator[_Entry]:
     reg_tlib = getattr(cls, "_reg_typelib_", None)
     if reg_tlib is not None:
         yield (HKCR, rf"CLSID\{reg_clsid}\Typelib", "", reg_tlib[0])