diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index aa36ce86c..a18173add 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -22,8 +22,8 @@ pub fn action_api<C: Context>() -> ParentHandler<C> {
             "get-input",
             from_fn_async(get_action_input)
                 .with_display_serializable()
+                .with_about("Get action input spec")
                 .with_call_remote::<CliContext>()
-                .with_about("Get action input spec"),
         )
         .subcommand(
             "run",
@@ -35,8 +35,8 @@ pub fn action_api<C: Context>() -> ParentHandler<C> {
                     }
                     Ok(())
                 })
+                .with_about("Run service action")
                 .with_call_remote::<CliContext>()
-                .with_about("Run service action"),
         )
 }
 
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index b1a66754b..c4c75a141 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -102,8 +102,8 @@ pub fn auth<C: Context>() -> ParentHandler<C> {
             from_fn_async(logout)
                 .with_metadata("get_session", Value::Bool(true))
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Log out of StartOS server"),
+                .with_about("Log out of StartOS server")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "session",
@@ -124,8 +124,8 @@ pub fn auth<C: Context>() -> ParentHandler<C> {
             from_fn_async(get_pubkey)
                 .with_metadata("authenticated", Value::Bool(false))
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Get public key derived from server private key"),
+                .with_about("Get public key derived from server private key")
+                .with_call_remote::<CliContext>(),
         )
 }
 
@@ -302,15 +302,15 @@ pub fn session<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_sessions(handle.params, result))
                 })
-                .with_call_remote::<CliContext>()
-                .with_about("Display all server sessions"),
+                .with_about("Display all server sessions")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "kill",
             from_fn_async(kill)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Terminate existing server session(s)"),
+                .with_about("Terminate existing server session(s)")
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/backup/mod.rs b/core/startos/src/backup/mod.rs
index fa826eccb..86b760dd6 100644
--- a/core/startos/src/backup/mod.rs
+++ b/core/startos/src/backup/mod.rs
@@ -40,9 +40,13 @@ pub fn backup<C: Context>() -> ParentHandler<C> {
             "create",
             from_fn_async(backup_bulk::backup_all)
                 .no_display()
-                .with_call_remote::<CliContext>().with_about("Create backup for all packages"),
+                .with_call_remote::<CliContext>()
+                .with_about("Create backup for all packages"),
+        )
+        .subcommand(
+            "target",
+            target::target::<C>().with_about("Commands related to a backup target"),
         )
-        .subcommand("target", target::target::<C>().with_about("Commands related to a backup target"))
 }
 
 pub fn package_backup<C: Context>() -> ParentHandler<C> {
@@ -50,8 +54,8 @@ pub fn package_backup<C: Context>() -> ParentHandler<C> {
         "restore",
         from_fn_async(restore::restore_packages_rpc)
             .no_display()
-            .with_call_remote::<CliContext>()
-            .with_about("Restore package(s) from backup"),
+            .with_about("Restore package(s) from backup")
+            .with_call_remote::<CliContext>(),
     )
 }
 
diff --git a/core/startos/src/backup/target/cifs.rs b/core/startos/src/backup/target/cifs.rs
index a9e32c255..71cbe267e 100644
--- a/core/startos/src/backup/target/cifs.rs
+++ b/core/startos/src/backup/target/cifs.rs
@@ -52,22 +52,22 @@ pub fn cifs<C: Context>() -> ParentHandler<C> {
             "add",
             from_fn_async(add)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Add a new backup target"),
+                .with_about("Add a new backup target")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "update",
             from_fn_async(update)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Update an existing backup target"),
+                .with_about("Update an existing backup target")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Remove an existing backup target"),
+                .with_about("Remove an existing backup target")
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index 32f206633..eb3fc29bc 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -149,8 +149,8 @@ pub fn target<C: Context>() -> ParentHandler<C> {
             "list",
             from_fn_async(list)
                 .with_display_serializable()
-                .with_call_remote::<CliContext>()
-                .with_about("List existing backup targets"),
+                .with_about("List existing backup targets")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "info",
@@ -159,21 +159,21 @@ pub fn target<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn::<CliContext, _>(|params, info| {
                     Ok(display_backup_info(params.params, info))
                 })
-                .with_call_remote::<CliContext>()
-                .with_about("Display package backup information"),
+                .with_about("Display package backup information")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "mount",
             from_fn_async(mount)
-                .with_call_remote::<CliContext>()
-                .with_about("Mount backup target"),
+                .with_about("Mount backup target")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "umount",
             from_fn_async(umount)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Unmount backup target"),
+                .with_about("Unmount backup target")
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index f54b9d692..c15ef60d3 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -312,8 +312,8 @@ pub fn put<C: Context>() -> ParentHandler<C> {
         "ui",
         from_fn_async(ui)
             .with_display_serializable()
-            .with_call_remote::<CliContext>()
-            .with_about("Store pointer and value in db"),
+            .with_about("Store pointer and value in db")
+            .with_call_remote::<CliContext>(),
     )
 }
 #[derive(Deserialize, Serialize, Parser, TS)]
diff --git a/core/startos/src/diagnostic.rs b/core/startos/src/diagnostic.rs
index 0bccb3e93..3eab3b16b 100644
--- a/core/startos/src/diagnostic.rs
+++ b/core/startos/src/diagnostic.rs
@@ -16,8 +16,8 @@ pub fn diagnostic<C: Context>() -> ParentHandler<C> {
         .subcommand(
             "error",
             from_fn(error)
-                .with_call_remote::<CliContext>()
-                .with_about("Display diagnostic error"),
+                .with_about("Display diagnostic error")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "logs",
@@ -43,8 +43,8 @@ pub fn diagnostic<C: Context>() -> ParentHandler<C> {
             "restart",
             from_fn(restart)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Restart the server"),
+                .with_about("Restart the server")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "disk",
@@ -54,8 +54,8 @@ pub fn diagnostic<C: Context>() -> ParentHandler<C> {
             "rebuild",
             from_fn_async(rebuild)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Teardown and rebuild service containers"),
+                .with_about("Teardown and rebuild service containers")
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/disk/mod.rs b/core/startos/src/disk/mod.rs
index 063721f7e..d1fbe282f 100644
--- a/core/startos/src/disk/mod.rs
+++ b/core/startos/src/disk/mod.rs
@@ -51,8 +51,8 @@ pub fn disk<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_disk_info(handle.params, result))
                 })
-                .with_call_remote::<CliContext>()
-                .with_about("List disk info"),
+                .with_about("List disk info")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand("repair", from_fn_async(|_: C| repair()).no_cli())
         .subcommand(
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 2c02fadb9..a6b1cd0c7 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -122,15 +122,15 @@ pub fn main_api<C: Context>() -> ParentHandler<C> {
             "echo",
             from_fn(echo::<RpcContext>)
                 .with_metadata("authenticated", Value::Bool(false))
-                .with_call_remote::<CliContext>()
-                .with_about("Echo a message"),
+                .with_about("Echo a message")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "state",
             from_fn(|_: RpcContext| Ok::<_, Error>(ApiState::Running))
                 .with_metadata("authenticated", Value::Bool(false))
-                .with_call_remote::<CliContext>()
-                .with_about("Display the API that is currently serving"),
+                .with_about("Display the API that is currently serving")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "server",
@@ -209,8 +209,8 @@ pub fn server<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(system::display_time(handle.params, result))
                 })
+                .with_about("Display current time and server uptime")
                 .with_call_remote::<CliContext>()
-                .with_about("Display current time and server uptime"),
         )
         .subcommand(
             "experimental",
@@ -237,29 +237,29 @@ pub fn server<C: Context>() -> ParentHandler<C> {
             "metrics",
             from_fn_async(system::metrics)
                 .with_display_serializable()
+                .with_about("Display information about the server i.e. temperature, RAM, CPU, and disk usage")
                 .with_call_remote::<CliContext>()
-                .with_about("Display information about the server i.e. temperature, RAM, CPU, and disk usage"),
         )
         .subcommand(
             "shutdown",
             from_fn_async(shutdown::shutdown)
                 .no_display()
+                .with_about("Shutdown the server")
                 .with_call_remote::<CliContext>()
-                .with_about("Shutdown the server"),
         )
         .subcommand(
             "restart",
             from_fn_async(shutdown::restart)
                 .no_display()
+                .with_about("Restart the server")
                 .with_call_remote::<CliContext>()
-                .with_about("Restart the server"),
         )
         .subcommand(
             "rebuild",
             from_fn_async(shutdown::rebuild)
                 .no_display()
+                .with_about("Teardown and rebuild service containers")
                 .with_call_remote::<CliContext>()
-                .with_about("Teardown and rebuild service containers"),
         )
         .subcommand(
             "update",
@@ -284,22 +284,22 @@ pub fn server<C: Context>() -> ParentHandler<C> {
             .with_custom_display_fn(|_handle, result| {
                 Ok(firmware::display_firmware_update_result(result))
             })
+            .with_about("Update the mainboard's firmware to the latest firmware available in this version of StartOS if available. Note: This command does not reach out to the Internet")
             .with_call_remote::<CliContext>()
-            .with_about("Update the mainboard's firmware to the latest firmware available in this version of StartOS if available. Note: This command does not reach out to the Internet"),
         )
         .subcommand(
             "set-smtp",
             from_fn_async(system::set_system_smtp)
                 .no_display()
+                .with_about("Set system smtp server and credentials")
                 .with_call_remote::<CliContext>()
-                .with_about("Set system smtp server and credentials"),
         )
         .subcommand(
             "clear-smtp",
             from_fn_async(system::clear_system_smtp)
                 .no_display()
+                .with_about("Remove system smtp server and credentials")
                 .with_call_remote::<CliContext>()
-                .with_about("Remove system smtp server and credentials"),
         )
 }
 
@@ -332,54 +332,54 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(install::uninstall)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Remove a package"),
+                .with_about("Remove a package")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "list",
             from_fn_async(install::list)
                 .with_display_serializable()
-                .with_call_remote::<CliContext>()
-                .with_about("List installed packages"),
+                .with_about("List installed packages")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "installed-version",
             from_fn_async(install::installed_version)
                 .with_display_serializable()
-                .with_call_remote::<CliContext>()
-                .with_about("Display installed version for a PackageId"),
+                .with_about("Display installed version for a PackageId")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "start",
             from_fn_async(control::start)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Start a package container"),
+                .with_about("Start a package container")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "stop",
             from_fn_async(control::stop)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Stop a package container"),
+                .with_about("Stop a package container")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "restart",
             from_fn_async(control::restart)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Restart a package container"),
+                .with_about("Restart a package container")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "rebuild",
             from_fn_async(service::rebuild)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Rebuild service container"),
+                .with_about("Rebuild service container")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand("logs", logs::package_logs())
         .subcommand(
@@ -398,8 +398,8 @@ pub fn package<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|_handle, result| {
                     Ok(properties::display_properties(result))
                 })
-                .with_call_remote::<CliContext>()
-                .with_about("Display package Properties"),
+                .with_about("Display package Properties")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "backup",
@@ -433,15 +433,15 @@ pub fn diagnostic_api() -> ParentHandler<DiagnosticContext> {
         .subcommand(
             "echo",
             from_fn(echo::<DiagnosticContext>)
-                .with_call_remote::<CliContext>()
-                .with_about("Echo a message"),
+                .with_about("Echo a message")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "state",
             from_fn(|_: DiagnosticContext| Ok::<_, Error>(ApiState::Error))
                 .with_metadata("authenticated", Value::Bool(false))
-                .with_call_remote::<CliContext>()
-                .with_about("Display the API that is currently serving"),
+                .with_about("Display the API that is currently serving")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "diagnostic",
@@ -461,15 +461,15 @@ pub fn init_api() -> ParentHandler<InitContext> {
         .subcommand(
             "echo",
             from_fn(echo::<InitContext>)
-                .with_call_remote::<CliContext>()
-                .with_about("Echo a message"),
+                .with_about("Echo a message")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "state",
             from_fn(|_: InitContext| Ok::<_, Error>(ApiState::Initializing))
                 .with_metadata("authenticated", Value::Bool(false))
-                .with_call_remote::<CliContext>()
-                .with_about("Display the API that is currently serving"),
+                .with_about("Display the API that is currently serving")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "init",
@@ -489,8 +489,8 @@ pub fn setup_api() -> ParentHandler<SetupContext> {
         .subcommand(
             "echo",
             from_fn(echo::<SetupContext>)
-                .with_call_remote::<CliContext>()
-                .with_about("Echo a message"),
+                .with_about("Echo a message")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand("setup", setup::setup::<SetupContext>())
 }
@@ -506,8 +506,8 @@ pub fn install_api() -> ParentHandler<InstallContext> {
         .subcommand(
             "echo",
             from_fn(echo::<InstallContext>)
-                .with_call_remote::<CliContext>()
-                .with_about("Echo a message"),
+                .with_about("Echo a message")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "install",
diff --git a/core/startos/src/lxc/dev.rs b/core/startos/src/lxc/dev.rs
index 7a067463b..506cb2e9b 100644
--- a/core/startos/src/lxc/dev.rs
+++ b/core/startos/src/lxc/dev.rs
@@ -18,8 +18,8 @@ pub fn lxc<C: Context>() -> ParentHandler<C> {
         .subcommand(
             "create",
             from_fn_async(create)
-                .with_call_remote::<CliContext>()
-                .with_about("Create lxc container"),
+                .with_about("Create lxc container")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "list",
@@ -33,15 +33,15 @@ pub fn lxc<C: Context>() -> ParentHandler<C> {
                     table.printstd();
                     Ok(())
                 })
-                .with_call_remote::<CliContext>()
-                .with_about("List lxc containers"),
+                .with_about("List lxc containers")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Remove lxc container"),
+                .with_about("Remove lxc container")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand("connect", from_fn_async(connect_rpc).no_cli())
         .subcommand(
diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs
index 73d792432..e323ba371 100644
--- a/core/startos/src/net/dhcp.rs
+++ b/core/startos/src/net/dhcp.rs
@@ -58,8 +58,8 @@ pub fn dhcp<C: Context>() -> ParentHandler<C> {
         "update",
         from_fn_async::<_, _, (), Error, (RpcContext, UpdateParams)>(update)
             .no_display()
-            .with_call_remote::<CliContext>()
-            .with_about("Update IP assigned by dhcp"),
+            .with_about("Update IP assigned by dhcp")
+            .with_call_remote::<CliContext>(),
     )
 }
 #[derive(Deserialize, Serialize, Parser, TS)]
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index 5735102b7..d93ce9302 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -91,8 +91,8 @@ pub fn tor<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_services(handle.params, result))
                 })
-                .with_call_remote::<CliContext>()
-                .with_about("Display Tor V3 Onion Addresses"),
+                .with_about("Display Tor V3 Onion Addresses")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand("logs", logs().with_about("Display Tor logs"))
         .subcommand(
@@ -105,8 +105,8 @@ pub fn tor<C: Context>() -> ParentHandler<C> {
             "reset",
             from_fn_async(reset)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Reset Tor daemon"),
+                .with_about("Reset Tor daemon")
+                .with_call_remote::<CliContext>(),
         )
 }
 #[derive(Deserialize, Serialize, Parser, TS)]
diff --git a/core/startos/src/net/wifi.rs b/core/startos/src/net/wifi.rs
index aac09f985..056a403de 100644
--- a/core/startos/src/net/wifi.rs
+++ b/core/startos/src/net/wifi.rs
@@ -43,22 +43,22 @@ pub fn wifi<C: Context>() -> ParentHandler<C> {
             "add",
             from_fn_async(add)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Add wifi ssid and password"),
+                .with_about("Add wifi ssid and password")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "connect",
             from_fn_async(connect)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Connect to wifi network"),
+                .with_about("Connect to wifi network")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete",
             from_fn_async(delete)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Remove a wifi network"),
+                .with_about("Remove a wifi network")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "get",
@@ -67,8 +67,8 @@ pub fn wifi<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_wifi_info(handle.params, result))
                 })
-                .with_call_remote::<CliContext>()
-                .with_about("List wifi info"),
+                .with_about("List wifi info")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "country",
@@ -86,8 +86,8 @@ pub fn available<C: Context>() -> ParentHandler<C> {
         from_fn_async(get_available)
             .with_display_serializable()
             .with_custom_display_fn(|handle, result| Ok(display_wifi_list(handle.params, result)))
-            .with_call_remote::<CliContext>()
-            .with_about("List available wifi networks"),
+            .with_about("List available wifi networks")
+            .with_call_remote::<CliContext>(),
     )
 }
 
@@ -96,8 +96,8 @@ pub fn country<C: Context>() -> ParentHandler<C> {
         "set",
         from_fn_async(set_country)
             .no_display()
-            .with_call_remote::<CliContext>()
-            .with_about("Set Country"),
+            .with_about("Set Country")
+            .with_call_remote::<CliContext>(),
     )
 }
 
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index 4dcb35a8b..aff69ab23 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -26,29 +26,29 @@ pub fn notification<C: Context>() -> ParentHandler<C> {
             "list",
             from_fn_async(list)
                 .with_display_serializable()
-                .with_call_remote::<CliContext>()
-                .with_about("List notifications"),
+                .with_about("List notifications")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete",
             from_fn_async(delete)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Delete notification for a given id"),
+                .with_about("Delete notification for a given id")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete-before",
             from_fn_async(delete_before)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Delete notifications preceding a given id"),
+                .with_about("Delete notifications preceding a given id")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "create",
             from_fn_async(create)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Persist a newly created notification"),
+                .with_about("Persist a newly created notification")
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 56d3513b1..46ed4ae8c 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -36,15 +36,15 @@ pub fn install<C: Context>() -> ParentHandler<C> {
             "execute",
             from_fn_async(execute::<InstallContext>)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Install StartOS over existing version"),
+                .with_about("Install StartOS over existing version")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "reboot",
             from_fn_async(reboot)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Restart the server"),
+                .with_about("Restart the server")
+                .with_call_remote::<CliContext>(),
         )
 }
 
@@ -53,8 +53,8 @@ pub fn disk<C: Context>() -> ParentHandler<C> {
         "list",
         from_fn_async(list)
             .no_display()
-            .with_call_remote::<CliContext>()
-            .with_about("List disk info"),
+            .with_about("List disk info")
+            .with_call_remote::<CliContext>(),
     )
 }
 
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index 0f171ed0f..a327a9587 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -34,8 +34,8 @@ pub fn admin_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(list_admins)
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| Ok(display_signers(handle.params, result)))
-                .with_call_remote::<CliContext>()
-                .with_about("List admin signers"),
+                .with_about("List admin signers")
+                .with_call_remote::<CliContext>(),
         )
 }
 
@@ -47,8 +47,8 @@ fn signers_api<C: Context>() -> ParentHandler<C> {
                 .with_metadata("admin", Value::Bool(true))
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| Ok(display_signers(handle.params, result)))
-                .with_call_remote::<CliContext>()
-                .with_about("List signers"),
+                .with_about("List signers")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "add",
diff --git a/core/startos/src/registry/mod.rs b/core/startos/src/registry/mod.rs
index 7e3e4b8ae..064a4fed6 100644
--- a/core/startos/src/registry/mod.rs
+++ b/core/startos/src/registry/mod.rs
@@ -82,15 +82,15 @@ pub fn registry_api<C: Context>() -> ParentHandler<C> {
             "index",
             from_fn_async(get_full_index)
                 .with_display_serializable()
-                .with_call_remote::<CliContext>()
-                .with_about("List info including registry name and packages"),
+                .with_about("List info including registry name and packages")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "info",
             from_fn_async(get_info)
                 .with_display_serializable()
-                .with_call_remote::<CliContext>()
-                .with_about("Display registry name, icon, and package categories"),
+                .with_about("Display registry name, icon, and package categories")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "os",
diff --git a/core/startos/src/registry/os/mod.rs b/core/startos/src/registry/os/mod.rs
index 8c2f05daa..a1d18cb03 100644
--- a/core/startos/src/registry/os/mod.rs
+++ b/core/startos/src/registry/os/mod.rs
@@ -15,8 +15,8 @@ pub fn os_api<C: Context>() -> ParentHandler<C> {
             "index",
             from_fn_async(index::get_os_index)
                 .with_display_serializable()
-                .with_call_remote::<CliContext>()
-                .with_about("List index of OS versions"),
+                .with_about("List index of OS versions")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "asset",
diff --git a/core/startos/src/registry/os/version/mod.rs b/core/startos/src/registry/os/version/mod.rs
index e5b6aec34..8e4349ed9 100644
--- a/core/startos/src/registry/os/version/mod.rs
+++ b/core/startos/src/registry/os/version/mod.rs
@@ -26,16 +26,16 @@ pub fn version_api<C: Context>() -> ParentHandler<C> {
                 .with_metadata("admin", Value::Bool(true))
                 .with_metadata("get_signer", Value::Bool(true))
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Add OS version"),
+                .with_about("Add OS version")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove_version)
                 .with_metadata("admin", Value::Bool(true))
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Remove OS version"),
+                .with_about("Remove OS version")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "signer",
@@ -48,8 +48,8 @@ pub fn version_api<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_version_info(handle.params, result))
                 })
-                .with_call_remote::<CliContext>()
-                .with_about("Get OS versions and related version info"),
+                .with_about("Get OS versions and related version info")
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/registry/os/version/signer.rs b/core/startos/src/registry/os/version/signer.rs
index d3a114a76..c72bb5ef4 100644
--- a/core/startos/src/registry/os/version/signer.rs
+++ b/core/startos/src/registry/os/version/signer.rs
@@ -21,24 +21,24 @@ pub fn signer_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(add_version_signer)
                 .with_metadata("admin", Value::Bool(true))
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Add version signer"),
+                .with_about("Add version signer")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove_version_signer)
                 .with_metadata("admin", Value::Bool(true))
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Remove version signer"),
+                .with_about("Remove version signer")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "list",
             from_fn_async(list_version_signers)
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| Ok(display_signers(handle.params, result)))
-                .with_call_remote::<CliContext>()
-                .with_about("List version signers and related signer info"),
+                .with_about("List version signers and related signer info")
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/registry/package/mod.rs b/core/startos/src/registry/package/mod.rs
index 334a833bc..ef312dc28 100644
--- a/core/startos/src/registry/package/mod.rs
+++ b/core/startos/src/registry/package/mod.rs
@@ -14,8 +14,8 @@ pub fn package_api<C: Context>() -> ParentHandler<C> {
             "index",
             from_fn_async(index::get_package_index)
                 .with_display_serializable()
-                .with_call_remote::<CliContext>()
-                .with_about("List packages and categories"),
+                .with_about("List packages and categories")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "add",
@@ -37,7 +37,7 @@ pub fn package_api<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     get::display_package_info(handle.params, result)
                 })
-                .with_call_remote::<CliContext>()
-                .with_about("List installation candidate package(s)"),
+                .with_about("List installation candidate package(s)")
+                .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index 254d4faae..99c2ae66c 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -86,15 +86,15 @@ pub fn ssh<C: Context>() -> ParentHandler<C> {
             "add",
             from_fn_async(add)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Add ssh key"),
+                .with_about("Add ssh key")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete",
             from_fn_async(delete)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Remove ssh key"),
+                .with_about("Remove ssh key")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "list",
@@ -103,8 +103,8 @@ pub fn ssh<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_all_ssh_keys(handle.params, result))
                 })
-                .with_call_remote::<CliContext>()
-                .with_about("List ssh keys"),
+                .with_about("List ssh keys")
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index 0b4df0c25..e64f30e98 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -31,8 +31,8 @@ pub fn experimental<C: Context>() -> ParentHandler<C> {
             "zram",
             from_fn_async(zram)
                 .no_display()
-                .with_call_remote::<CliContext>()
-                .with_about("Enable zram"),
+                .with_about("Enable zram")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "governor",
@@ -41,8 +41,8 @@ pub fn experimental<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_governor_info(handle.params, result))
                 })
-                .with_call_remote::<CliContext>()
-                .with_about("Show current and available CPU governors"),
+                .with_about("Show current and available CPU governors")
+                .with_call_remote::<CliContext>(),
         )
 }