diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbe8ff2758f..3db292b23b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 - BREAKING(general)! Removed support for node 18.
 - BREAKING(apphosting)! `init emulators` App Hosting flow now creates `apphosting.emulator.yaml` with references to live secrets rather than `apphosting.local.yaml` with saved plaintext. `apphosting:config:export` command has been removed (#8361)
 - BREAKING(apphosting)! Removed `--location` flag from `apphosting` commands. Instead, commands now prompt for primary region as needed.
-- BREAKING(dataconnect)! `deploy dataconnect` will now warn about unsafe connector changes and insecure operations.
-- BREAKING(cloud functions)! `deploy functions` no longer aggressively tries to clean up functions artifacts. Instead, it sets up an Artifact Registry Cleanup Policy to clean these up automatically.
+- BREAKING(dataconnect)! `deploy dataconnect` now warns about unsafe connector changes and insecure operations.
+- BREAKING(cloud functions)! Removed the `experimental:functions:shell` command. Use `functions:shell` instead.
 - Updated the Firebase Data Connect local toolkit to v2.0.0, which contains the following changes: (#8370)
   - Added support for aggregate functions in queries.
   - BREAKING: New types for Generated React SDKs.
@@ -11,7 +11,7 @@
 - `apphosting:secrets:grantAccess` can now grant access to emails and can grant multiple secrets at once (#8357)
 - `apphosting:secrets:set` now has flows to help with test secrets (#8359)
 - Updated `init dataconnect` templates to `v1`.
-- Fix bug in Auth emulator where accounts:lookup is case-sensitive for emails (#8344)
-- Fix bug where function deploys didn't support shorthand notation and parameterized service account (#8366)
+- Fixed a bug in Auth emulator where accounts:lookup is case-sensitive for emails (#8344)
+- Fixed a bug where function deploys didn't support shorthand notation and parameterized service account (#8366)
 - Fixed an issue where `sql:setup` would incorrectly remove the `cloudsqlsuperuser` role from `firebasesuperuser` (#8363)
 - Fixed a bug where `appdistribution:testers:list` would error out if there were no testers.
diff --git a/src/commands/appdistribution-groups-create.ts b/src/commands/appdistribution-groups-create.ts
index a12c809dd3c..4a5efb0d0f8 100644
--- a/src/commands/appdistribution-groups-create.ts
+++ b/src/commands/appdistribution-groups-create.ts
@@ -5,7 +5,7 @@ import { AppDistributionClient } from "../appdistribution/client";
 import { getProjectName } from "../appdistribution/options-parser-util";
 
 export const command = new Command("appdistribution:groups:create <displayName> [alias]")
-  .description("create group in project")
+  .description("create an App Distribution group")
   .alias("appdistribution:group:create")
   .before(requireAuth)
   .action(async (displayName: string, alias?: string, options?: any) => {
diff --git a/src/commands/appdistribution-groups-delete.ts b/src/commands/appdistribution-groups-delete.ts
index 62319e5c830..9ee71bad793 100644
--- a/src/commands/appdistribution-groups-delete.ts
+++ b/src/commands/appdistribution-groups-delete.ts
@@ -6,7 +6,7 @@ import { AppDistributionClient } from "../appdistribution/client";
 import { getProjectName } from "../appdistribution/options-parser-util";
 
 export const command = new Command("appdistribution:groups:delete <alias>")
-  .description("delete group from a project")
+  .description("delete an App Distribution group")
   .alias("appdistribution:group:delete")
   .before(requireAuth)
   .action(async (alias: string, options: any) => {
diff --git a/src/commands/appdistribution-groups-list.ts b/src/commands/appdistribution-groups-list.ts
index 68014e3860c..5b7fa7ae6b2 100644
--- a/src/commands/appdistribution-groups-list.ts
+++ b/src/commands/appdistribution-groups-list.ts
@@ -11,7 +11,7 @@ import * as utils from "../utils";
 import * as Table from "cli-table3";
 
 export const command = new Command("appdistribution:groups:list")
-  .description("list groups in project")
+  .description("list App Distribution groups")
   .alias("appdistribution:group:list")
   .before(requireAuth)
   .action(async (options?: Options): Promise<ListGroupsResponse> => {
diff --git a/src/commands/appdistribution-testers-add.ts b/src/commands/appdistribution-testers-add.ts
index 81c63381606..27d85a68a64 100644
--- a/src/commands/appdistribution-testers-add.ts
+++ b/src/commands/appdistribution-testers-add.ts
@@ -5,7 +5,7 @@ import { AppDistributionClient } from "../appdistribution/client";
 import { getEmails, getProjectName } from "../appdistribution/options-parser-util";
 
 export const command = new Command("appdistribution:testers:add [emails...]")
-  .description("add testers to project (and possibly group)")
+  .description("add testers to project (and App Distribution group, if specified via flag)")
   .option("--file <file>", "a path to a file containing a list of tester emails to be added")
   .option(
     "--group-alias <group-alias>",
diff --git a/src/commands/appdistribution-testers-remove.ts b/src/commands/appdistribution-testers-remove.ts
index fbe6bbc8cf8..2070454df02 100644
--- a/src/commands/appdistribution-testers-remove.ts
+++ b/src/commands/appdistribution-testers-remove.ts
@@ -7,7 +7,7 @@ import { getEmails, getProjectName } from "../appdistribution/options-parser-uti
 import { logger } from "../logger";
 
 export const command = new Command("appdistribution:testers:remove [emails...]")
-  .description("remove testers from a project (or group)")
+  .description("remove testers from a project (or App Distribution group, if specified via flag)")
   .option("--file <file>", "a path to a file containing a list of tester emails to be removed")
   .option(
     "--group-alias <group-alias>",
diff --git a/src/commands/apphosting-secrets-access.ts b/src/commands/apphosting-secrets-access.ts
index ecd5d539e7e..ffbc4024234 100644
--- a/src/commands/apphosting-secrets-access.ts
+++ b/src/commands/apphosting-secrets-access.ts
@@ -9,7 +9,7 @@ import { requirePermissions } from "../requirePermissions";
 
 export const command = new Command("apphosting:secrets:access <secretName[@version]>")
   .description(
-    "Access secret value given secret and its version. Defaults to accessing the latest version.",
+    "access secret value given secret and its version. Defaults to accessing the latest version",
   )
   .before(requireAuth)
   .before(secretManager.ensureApi)
diff --git a/src/commands/apphosting-secrets-describe.ts b/src/commands/apphosting-secrets-describe.ts
index 6de8aef6311..5f6b6076359 100644
--- a/src/commands/apphosting-secrets-describe.ts
+++ b/src/commands/apphosting-secrets-describe.ts
@@ -9,7 +9,7 @@ import { requirePermissions } from "../requirePermissions";
 import * as Table from "cli-table3";
 
 export const command = new Command("apphosting:secrets:describe <secretName>")
-  .description("Get metadata for secret and its versions.")
+  .description("get metadata for secret and its versions")
   .before(requireAuth)
   .before(secretManager.ensureApi)
   .before(requirePermissions, ["secretmanager.secrets.get"])
diff --git a/src/commands/apps-android-sha-create.ts b/src/commands/apps-android-sha-create.ts
index 5103374f4f3..7a7609ea9ee 100644
--- a/src/commands/apps-android-sha-create.ts
+++ b/src/commands/apps-android-sha-create.ts
@@ -15,7 +15,7 @@ function getCertHashType(shaHash: string): string {
 }
 
 export const command = new Command("apps:android:sha:create <appId> <shaHash>")
-  .description("add a SHA certificate hash for a given app id.")
+  .description("add a SHA certificate hash for a given app id")
   .before(requireAuth)
   .action(
     async (appId: string = "", shaHash: string = "", options: any): Promise<AppAndroidShaData> => {
diff --git a/src/commands/apps-android-sha-delete.ts b/src/commands/apps-android-sha-delete.ts
index 209d0376651..02cac18d3b1 100644
--- a/src/commands/apps-android-sha-delete.ts
+++ b/src/commands/apps-android-sha-delete.ts
@@ -7,7 +7,7 @@ import { requireAuth } from "../requireAuth";
 import { promiseWithSpinner } from "../utils";
 
 export const command = new Command("apps:android:sha:delete <appId> <shaId>")
-  .description("delete a SHA certificate hash for a given app id.")
+  .description("delete a SHA certificate hash for a given app id")
   .before(requireAuth)
   .action(async (appId: string = "", shaId: string = "", options: any): Promise<void> => {
     const projectId = needProjectId(options);
diff --git a/src/commands/apps-android-sha-list.ts b/src/commands/apps-android-sha-list.ts
index 3ed01047d7e..65e0f260f1c 100644
--- a/src/commands/apps-android-sha-list.ts
+++ b/src/commands/apps-android-sha-list.ts
@@ -36,7 +36,7 @@ function logCertificatesCount(count: number = 0): void {
 }
 
 export const command = new Command("apps:android:sha:list <appId>")
-  .description("list the SHA certificate hashes for a given app id. ")
+  .description("list the SHA certificate hashes for a given app id")
   .before(requireAuth)
   .action(async (appId: string = "", options: any): Promise<AppAndroidShaData[]> => {
     const projectId = needProjectId(options);
diff --git a/src/commands/apps-create.ts b/src/commands/apps-create.ts
index aa8e0601d02..a95c075909c 100644
--- a/src/commands/apps-create.ts
+++ b/src/commands/apps-create.ts
@@ -53,7 +53,7 @@ interface AppsCreateOptions extends Options {
 
 export const command = new Command("apps:create [platform] [displayName]")
   .description(
-    "create a new Firebase app. [platform] can be IOS, ANDROID or WEB (case insensitive).",
+    "create a new Firebase app. [platform] can be IOS, ANDROID or WEB (case insensitive)",
   )
   .option("-a, --package-name <packageName>", "required package name for the Android app")
   .option("-b, --bundle-id <bundleId>", "required bundle id for the iOS app")
diff --git a/src/commands/apps-init.ts b/src/commands/apps-init.ts
index 3527126a1eb..053b74c7d0f 100644
--- a/src/commands/apps-init.ts
+++ b/src/commands/apps-init.ts
@@ -72,7 +72,7 @@ function toAppPlatform(str: string) {
 }
 
 export const command = new Command("apps:init [platform] [appId]")
-  .description("Automatically download and create config of a Firebase app. ")
+  .description("automatically download and create config of a Firebase app")
   .before(requireAuth)
   .option("-o, --out [file]", "(optional) write config output to a file")
   .action(async (platform = "", appId = "", options: AppsInitOptions): Promise<AppConfig> => {
diff --git a/src/commands/auth-export.ts b/src/commands/auth-export.ts
index 1de847d6b05..bb45e32fc64 100644
--- a/src/commands/auth-export.ts
+++ b/src/commands/auth-export.ts
@@ -17,7 +17,7 @@ interface exportOptions {
 }
 
 export const command = new Command("auth:export [dataFile]")
-  .description("Export accounts from your Firebase project into a data file")
+  .description("export accounts from your Firebase project into a data file")
   .option(
     "--format <format>",
     "Format of exported data (csv, json). Ignored if <dataFile> has format extension.",
diff --git a/src/commands/auth-import.ts b/src/commands/auth-import.ts
index 99011af78be..cbefe8191e2 100644
--- a/src/commands/auth-import.ts
+++ b/src/commands/auth-import.ts
@@ -21,7 +21,7 @@ import {
 const MAX_BATCH_SIZE = 1000;
 
 export const command = new Command("auth:import [dataFile]")
-  .description("import users into your Firebase project from a data file(.csv or .json)")
+  .description("import users into your Firebase project from a data file (.csv or .json)")
   .option(
     "--hash-algo <hashAlgo>",
     "specify the hash algorithm used in password for these accounts",
diff --git a/src/commands/database-instances-create.ts b/src/commands/database-instances-create.ts
index f860a232d0b..1cfcb2f8136 100644
--- a/src/commands/database-instances-create.ts
+++ b/src/commands/database-instances-create.ts
@@ -15,7 +15,7 @@ import { FirebaseError } from "../error";
 import { MISSING_DEFAULT_INSTANCE_ERROR_MESSAGE } from "../requireDatabaseInstance";
 
 export const command = new Command("database:instances:create <instanceName>")
-  .description("create a realtime database instance")
+  .description("create a Realtime Database instance")
   .option(
     "-l, --location <location>",
     "(optional) location for the database instance, defaults to us-central1",
diff --git a/src/commands/database-profile.ts b/src/commands/database-profile.ts
index 68fa9fb662f..f6be4bd209e 100644
--- a/src/commands/database-profile.ts
+++ b/src/commands/database-profile.ts
@@ -7,10 +7,8 @@ import { profiler } from "../profiler";
 import { Emulators } from "../emulator/types";
 import { warnEmulatorNotSupported } from "../emulator/commandUtils";
 
-const description = "profile the Realtime Database and generate a usage report";
-
 export const command = new Command("database:profile")
-  .description(description)
+  .description("profile the Realtime Database and generate a usage report")
   .option("-o, --output <filename>", "save the output to the specified file")
   .option(
     "-d, --duration <seconds>",
diff --git a/src/commands/database-settings-set.ts b/src/commands/database-settings-set.ts
index 2b3ac73b956..1c7092a8947 100644
--- a/src/commands/database-settings-set.ts
+++ b/src/commands/database-settings-set.ts
@@ -13,7 +13,7 @@ import { requireDatabaseInstance } from "../requireDatabaseInstance";
 import * as utils from "../utils";
 
 export const command = new Command("database:settings:set <path> <value>")
-  .description("set the realtime database setting at path.")
+  .description("set the Realtime Database setting at path")
   .option(
     "--instance <instance>",
     "use the database <instance>.firebaseio.com (if omitted, use default database instance)",
diff --git a/src/commands/database-update.ts b/src/commands/database-update.ts
index 37e32039f8b..97889baa530 100644
--- a/src/commands/database-update.ts
+++ b/src/commands/database-update.ts
@@ -16,7 +16,7 @@ import { requireDatabaseInstance } from "../requireDatabaseInstance";
 import * as utils from "../utils";
 
 export const command = new Command("database:update <path> [infile]")
-  .description("update some of the keys for the defined path in your Firebase")
+  .description("update some of the keys for the defined path in your Realtime Database")
   .option("-d, --data <data>", "specify escaped JSON directly")
   .option("-f, --force", "pass this option to bypass confirmation prompt")
   .option(
diff --git a/src/commands/dataconnect-sdk-generate.ts b/src/commands/dataconnect-sdk-generate.ts
index d522af7d4fa..967c2cfd6f8 100644
--- a/src/commands/dataconnect-sdk-generate.ts
+++ b/src/commands/dataconnect-sdk-generate.ts
@@ -12,7 +12,7 @@ import { getProjectDefaultAccount } from "../auth";
 type GenerateOptions = Options & { watch?: boolean };
 
 export const command = new Command("dataconnect:sdk:generate")
-  .description("generates typed SDKs for your Data Connect connectors")
+  .description("generate typed SDKs for your Data Connect connectors")
   .option(
     "--watch",
     "watch for changes to your connector GQL files and regenerate your SDKs when updates occur",
diff --git a/src/commands/dataconnect-services-list.ts b/src/commands/dataconnect-services-list.ts
index ecada7c5d04..1bf17378d82 100644
--- a/src/commands/dataconnect-services-list.ts
+++ b/src/commands/dataconnect-services-list.ts
@@ -9,7 +9,7 @@ import { ensureApis } from "../dataconnect/ensureApis";
 import * as Table from "cli-table3";
 
 export const command = new Command("dataconnect:services:list")
-  .description("list all deployed services in your Firebase project")
+  .description("list all deployed Data Connect services")
   .before(requirePermissions, [
     "dataconnect.services.list",
     "dataconnect.schemas.list",
diff --git a/src/commands/dataconnect-sql-diff.ts b/src/commands/dataconnect-sql-diff.ts
index 1ea50b92416..9b51d82d2d4 100644
--- a/src/commands/dataconnect-sql-diff.ts
+++ b/src/commands/dataconnect-sql-diff.ts
@@ -9,7 +9,7 @@ import { requireAuth } from "../requireAuth";
 
 export const command = new Command("dataconnect:sql:diff [serviceId]")
   .description(
-    "displays the differences between  a local DataConnect schema and your CloudSQL database's current schema",
+    "display the differences between a local Data Connect schema and your CloudSQL database's current schema",
   )
   .before(requirePermissions, [
     "firebasedataconnect.services.list",
diff --git a/src/commands/dataconnect-sql-grant.ts b/src/commands/dataconnect-sql-grant.ts
index 4fb77014086..ff491a39525 100644
--- a/src/commands/dataconnect-sql-grant.ts
+++ b/src/commands/dataconnect-sql-grant.ts
@@ -12,7 +12,7 @@ import { fdcSqlRoleMap } from "../gcp/cloudsql/permissions_setup";
 const allowedRoles = Object.keys(fdcSqlRoleMap);
 
 export const command = new Command("dataconnect:sql:grant [serviceId]")
-  .description("Grants the SQL role <role> to the provided user or service account <email>.")
+  .description("grants the SQL role <role> to the provided user or service account <email>")
   .option("-R, --role <role>", "The SQL role to grant. One of: owner, writer, or reader.")
   .option(
     "-E, --email <email>",
diff --git a/src/commands/dataconnect-sql-migrate.ts b/src/commands/dataconnect-sql-migrate.ts
index 5aa1f23558c..f75fe5ea98e 100644
--- a/src/commands/dataconnect-sql-migrate.ts
+++ b/src/commands/dataconnect-sql-migrate.ts
@@ -10,7 +10,7 @@ import { ensureApis } from "../dataconnect/ensureApis";
 import { logLabeledSuccess } from "../utils";
 
 export const command = new Command("dataconnect:sql:migrate [serviceId]")
-  .description("migrates your CloudSQL database's schema to match your local DataConnect schema")
+  .description("migrate your CloudSQL database's schema to match your local Data Connect schema")
   .before(requirePermissions, [
     "firebasedataconnect.services.list",
     "firebasedataconnect.schemas.list",
@@ -18,7 +18,7 @@ export const command = new Command("dataconnect:sql:migrate [serviceId]")
     "cloudsql.instances.connect",
   ])
   .before(requireAuth)
-  .withForce("Execute any required database changes without prompting")
+  .withForce("execute any required database changes without prompting")
   .action(async (serviceId: string, options: Options) => {
     const projectId = needProjectId(options);
     await ensureApis(projectId);
diff --git a/src/commands/dataconnect-sql-setup.ts b/src/commands/dataconnect-sql-setup.ts
index 8fa1a2dc0ea..5986ec33806 100644
--- a/src/commands/dataconnect-sql-setup.ts
+++ b/src/commands/dataconnect-sql-setup.ts
@@ -13,7 +13,7 @@ import { getIAMUser } from "../gcp/cloudsql/connect";
 import * as cloudSqlAdminClient from "../gcp/cloudsql/cloudsqladmin";
 
 export const command = new Command("dataconnect:sql:setup [serviceId]")
-  .description("Setup your CloudSQL database")
+  .description("set up your CloudSQL database")
   .before(requirePermissions, [
     "firebasedataconnect.services.list",
     "firebasedataconnect.schemas.list",
diff --git a/src/commands/dataconnect-sql-shell.ts b/src/commands/dataconnect-sql-shell.ts
index 9055267d6a5..dac772f9317 100644
--- a/src/commands/dataconnect-sql-shell.ts
+++ b/src/commands/dataconnect-sql-shell.ts
@@ -85,7 +85,9 @@ async function mainShellLoop(conn: pg.PoolClient) {
 }
 
 export const command = new Command("dataconnect:sql:shell [serviceId]")
-  .description("Starts a shell connected directly to your dataconnect cloudsql instance.")
+  .description(
+    "start a shell connected directly to your Data Connect service's linked CloudSQL instance",
+  )
   .before(requirePermissions, ["firebasedataconnect.services.list", "cloudsql.instances.connect"])
   .before(requireAuth)
   .action(async (serviceId: string, options: Options) => {
diff --git a/src/commands/deploy.ts b/src/commands/deploy.ts
index 2d750c9a470..322d18cadd8 100644
--- a/src/commands/deploy.ts
+++ b/src/commands/deploy.ts
@@ -88,13 +88,13 @@ export const command = new Command("deploy")
       "When filtering based on codebases, use colons to specify codebase names " +
       '(e.g. "--only functions:codebase1:func1,functions:codebase2:group1.subgroup1"). ' +
       "For data connect, can specify filters with colons to deploy only a service, connector, or schema" +
-      '(e.g. "--only dataconnect:serviceId,dataconnect:serviceId:connectorId,dataconnect:serviceId:schema"). ',
+      '(e.g. "--only dataconnect:serviceId,dataconnect:serviceId:connectorId,dataconnect:serviceId:schema")',
   )
   .option("--except <targets>", 'deploy to all targets except specified (e.g. "database")')
   .option(
     "--dry-run",
-    "Perform a dry run of your deployment. Validates your changes and builds your code without deploying any changes to your project. " +
-      "In order to provide better validation, this may still enable APIs on the target project.",
+    "perform a dry run of your deployment. Validates your changes and builds your code without deploying any changes to your project. " +
+      "In order to provide better validation, this may still enable APIs on the target project",
   )
   .before(requireConfig)
   .before((options) => {
diff --git a/src/commands/emulators-exec.ts b/src/commands/emulators-exec.ts
index 6c023cbe098..dadd455bd3a 100644
--- a/src/commands/emulators-exec.ts
+++ b/src/commands/emulators-exec.ts
@@ -6,7 +6,7 @@ export const command = new Command("emulators:exec <script>")
   .before(commandUtils.setExportOnExitOptions)
   .before(commandUtils.beforeEmulatorCommand)
   .description(
-    "start the local Firebase emulators, " + "run a test script, then shut down the emulators",
+    "start the local Firebase emulators, run a test script, then shut down the emulators",
   )
   .option(commandUtils.FLAG_ONLY, commandUtils.DESC_ONLY)
   .option(commandUtils.FLAG_INSPECT_FUNCTIONS, commandUtils.DESC_INSPECT_FUNCTIONS)
diff --git a/src/commands/experimental-functions-shell.ts b/src/commands/experimental-functions-shell.ts
deleted file mode 100644
index b36e889974a..00000000000
--- a/src/commands/experimental-functions-shell.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { actionFunction } from "../functionsShellCommandAction";
-import { Command } from "../command";
-import { requireConfig } from "../requireConfig";
-import { requirePermissions } from "../requirePermissions";
-
-export const command = new Command("experimental:functions:shell")
-  .description(
-    "launch full Node shell with emulated functions. (Alias for `firebase functions:shell.)",
-  )
-  .option("-p, --port <port>", "the port on which to emulate functions (default: 5000)", 5000)
-  .before(requireConfig)
-  .before(requirePermissions)
-  .action(actionFunction);
diff --git a/src/commands/ext-dev-register.ts b/src/commands/ext-dev-register.ts
index 6c0697e1d68..e5d681901cb 100644
--- a/src/commands/ext-dev-register.ts
+++ b/src/commands/ext-dev-register.ts
@@ -20,7 +20,7 @@ import { PublisherProfile } from "../extensions/types";
  * Register a publisher ID; run this before publishing any extensions.
  */
 export const command = new Command("ext:dev:register")
-  .description("register a publisher ID; run this before publishing your first extension.")
+  .description("register a publisher ID; run this before publishing your first extension")
   // temporary until registry-specific permissions are available
   .before(requirePermissions, ["firebaseextensions.sources.create"])
   .before(ensureExtensionsPublisherApiEnabled)
diff --git a/src/commands/ext-dev-usage.ts b/src/commands/ext-dev-usage.ts
index 87177190ddb..22552261a34 100644
--- a/src/commands/ext-dev-usage.ts
+++ b/src/commands/ext-dev-usage.ts
@@ -14,11 +14,11 @@ import { promptOnce } from "../prompt";
 import { shortenUrl } from "../shortenUrl";
 
 export const command = new Command("ext:dev:usage <publisherId>")
-  .description("get usage for an extension")
+  .description("get usage statistics for an extension")
   .help(
     "use this command to get the usage of extensions you published. " +
       "Specify the publisher ID you used to publish your extensions, " +
-      "or the extension ref of your published extension.",
+      "or the extension ref of your published extension",
   )
   .before(requireAuth)
   .before(checkMinRequiredVersion, "extDevMinVersion")
diff --git a/src/commands/ext-install.ts b/src/commands/ext-install.ts
index ae87a324750..8b8df029e36 100644
--- a/src/commands/ext-install.ts
+++ b/src/commands/ext-install.ts
@@ -34,11 +34,8 @@ import { displayDeveloperTOSWarning } from "../extensions/tos";
 /**
  * Command for installing an extension
  */
-export const command = new Command("ext:install [extensionRef]")
-  .description(
-    "add an uploaded extension to firebase.json if [publisherId/extensionId] is provided;" +
-      "or, add a local extension if [localPath] is provided",
-  )
+export const command = new Command("ext:install [extensionRefOrLocalPath]")
+  .description("add an extension to firebase.json")
   .option("--local", "deprecated")
   .withForce()
   .before(requirePermissions, ["firebaseextensions.instances.create"])
diff --git a/src/commands/firestore-backups-delete.ts b/src/commands/firestore-backups-delete.ts
index 8e36c62e527..6251802bd81 100644
--- a/src/commands/firestore-backups-delete.ts
+++ b/src/commands/firestore-backups-delete.ts
@@ -10,8 +10,8 @@ import { FirestoreOptions } from "../firestore/options";
 import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:backups:delete <backup>")
-  .description("Delete a backup under your Cloud Firestore database.")
-  .option("--force", "Attempt to delete backup without prompting for confirmation.")
+  .description("delete a backup under your Cloud Firestore database")
+  .option("--force", "attempt to delete backup without prompting for confirmation")
   .before(requirePermissions, ["datastore.backups.delete"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (backupName: string, options: FirestoreOptions) => {
diff --git a/src/commands/firestore-backups-get.ts b/src/commands/firestore-backups-get.ts
index 845ffd4bf4d..73aaa677e30 100644
--- a/src/commands/firestore-backups-get.ts
+++ b/src/commands/firestore-backups-get.ts
@@ -8,7 +8,7 @@ import { Backup, getBackup } from "../gcp/firestore";
 import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:backups:get <backup>")
-  .description("Get a Cloud Firestore database backup.")
+  .description("get a Cloud Firestore database backup")
   .before(requirePermissions, ["datastore.backups.get"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (backupName: string, options: FirestoreOptions) => {
diff --git a/src/commands/firestore-backups-list.ts b/src/commands/firestore-backups-list.ts
index 4a9cba0c405..8080b0d4b1a 100644
--- a/src/commands/firestore-backups-list.ts
+++ b/src/commands/firestore-backups-list.ts
@@ -9,10 +9,10 @@ import { logWarning } from "../utils";
 import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:backups:list")
-  .description("List all Cloud Firestore backups in a given location")
+  .description("list all Cloud Firestore backups in a given location")
   .option(
     "-l, --location <locationId>",
-    "Location to search for backups, for example 'nam5'. Run 'firebase firestore:locations' to get a list of eligible locations. Defaults to all locations.",
+    "location to search for backups, for example 'nam5'. Run 'firebase firestore:locations' to get a list of eligible locations. Defaults to all locations",
   )
   .before(requirePermissions, ["datastore.backups.list"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
diff --git a/src/commands/firestore-backups-schedules-create.ts b/src/commands/firestore-backups-schedules-create.ts
index 723ac6520e3..255c190b0c0 100644
--- a/src/commands/firestore-backups-schedules-create.ts
+++ b/src/commands/firestore-backups-schedules-create.ts
@@ -18,16 +18,16 @@ import { PrettyPrint } from "../firestore/pretty-print";
 import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:backups:schedules:create")
-  .description("Create a backup schedule under your Cloud Firestore database.")
+  .description("create a backup schedule under your Cloud Firestore database")
   .option(
     "-d, --database <databaseId>",
-    "Database under which you want to create a schedule. Defaults to the (default) database",
+    "database under which you want to create a schedule. Defaults to the (default) database",
   )
   .option("--retention <duration>", "duration string (e.g. 12h or 30d) for backup retention")
-  .option("--recurrence <recurrence>", "Recurrence settings; either DAILY or WEEKLY")
+  .option("--recurrence <recurrence>", "recurrence settings; either DAILY or WEEKLY")
   .option(
     "--day-of-week <dayOfWeek>",
-    "On which day of the week to perform backups; one of MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, or SUNDAY",
+    "on which day of the week to perform backups; one of MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, or SUNDAY",
   )
   .before(requirePermissions, ["datastore.backupSchedules.create"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
diff --git a/src/commands/firestore-backups-schedules-delete.ts b/src/commands/firestore-backups-schedules-delete.ts
index 81756db9854..40d34f18efb 100644
--- a/src/commands/firestore-backups-schedules-delete.ts
+++ b/src/commands/firestore-backups-schedules-delete.ts
@@ -10,8 +10,8 @@ import { FirestoreOptions } from "../firestore/options";
 import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:backups:schedules:delete <backupSchedule>")
-  .description("Delete a backup schedule under your Cloud Firestore database.")
-  .option("--force", "Attempt to delete backup schedule without prompting for confirmation.")
+  .description("delete a backup schedule under your Cloud Firestore database")
+  .option("--force", "attempt to delete backup schedule without prompting for confirmation")
   .before(requirePermissions, ["datastore.backupSchedules.delete"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (backupScheduleName: string, options: FirestoreOptions) => {
diff --git a/src/commands/firestore-backups-schedules-list.ts b/src/commands/firestore-backups-schedules-list.ts
index a69297ef1f4..ba14d5fe185 100644
--- a/src/commands/firestore-backups-schedules-list.ts
+++ b/src/commands/firestore-backups-schedules-list.ts
@@ -8,10 +8,10 @@ import { BackupSchedule, listBackupSchedules } from "../gcp/firestore";
 import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:backups:schedules:list")
-  .description("List backup schedules under your Cloud Firestore database.")
+  .description("list backup schedules under your Cloud Firestore database")
   .option(
     "-d, --database <databaseId>",
-    "Database whose schedules you wish to list. Defaults to the (default) database.",
+    "database whose schedules you wish to list. Defaults to the (default) database",
   )
   .before(requirePermissions, ["datastore.backupSchedules.list"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
diff --git a/src/commands/firestore-backups-schedules-update.ts b/src/commands/firestore-backups-schedules-update.ts
index 11a6dd3748d..dbea42e7d04 100644
--- a/src/commands/firestore-backups-schedules-update.ts
+++ b/src/commands/firestore-backups-schedules-update.ts
@@ -12,7 +12,7 @@ import { PrettyPrint } from "../firestore/pretty-print";
 import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:backups:schedules:update <backupSchedule>")
-  .description("Update a backup schedule under your Cloud Firestore database.")
+  .description("update a backup schedule under your Cloud Firestore database")
   .option("--retention <duration>", "duration string (e.g. 12h or 30d) for backup retention")
   .before(requirePermissions, ["datastore.backupSchedules.update"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
diff --git a/src/commands/firestore-databases-create.ts b/src/commands/firestore-databases-create.ts
index 2967384f04b..8b218ac1e92 100644
--- a/src/commands/firestore-databases-create.ts
+++ b/src/commands/firestore-databases-create.ts
@@ -12,25 +12,25 @@ import { PrettyPrint } from "../firestore/pretty-print";
 import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:databases:create <database>")
-  .description("Create a database in your Firebase project.")
+  .description("create a database in your Firebase project")
   .option(
     "--location <locationId>",
-    "Region to create database, for example 'nam5'. Run 'firebase firestore:locations' to get a list of eligible locations. (required)",
+    "region to create database, for example 'nam5'. Run 'firebase firestore:locations' to get a list of eligible locations (required)",
   )
   .option(
     "--delete-protection <deleteProtectionState>",
-    "Whether or not to prevent deletion of database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'",
+    "whether or not to prevent deletion of database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'",
   )
   .option(
     "--point-in-time-recovery <enablement>",
-    "Whether to enable the PITR feature on this database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'",
+    "whether to enable the PITR feature on this database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'",
   )
   // TODO(b/356137854): Remove allowlist only message once feature is public GA.
   .option(
     "-k, --kms-key-name <kmsKeyName>",
-    "The resource ID of a Cloud KMS key. If set, the database created will be a " +
+    "the resource ID of a Cloud KMS key. If set, the database created will be a " +
       "Customer-managed Encryption Key (CMEK) database encrypted with this key. " +
-      "This feature is allowlist only in initial launch.",
+      "This feature is allowlist only in initial launch",
   )
   .before(requirePermissions, ["datastore.databases.create"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
diff --git a/src/commands/firestore-databases-delete.ts b/src/commands/firestore-databases-delete.ts
index 60e0358aae2..584decf43ae 100644
--- a/src/commands/firestore-databases-delete.ts
+++ b/src/commands/firestore-databases-delete.ts
@@ -13,10 +13,8 @@ import { FirebaseError } from "../error";
 import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:databases:delete <database>")
-  .description(
-    "Delete a database in your Cloud Firestore project. Database delete protection state must be disabled. To do so, use the update command: firebase firestore:databases:update <database> --delete-protection DISABLED",
-  )
-  .option("--force", "Attempt to delete database without prompting for confirmation.")
+  .description("delete a database in your Cloud Firestore project")
+  .option("--force", "attempt to delete database without prompting for confirmation")
   .before(requirePermissions, ["datastore.databases.delete"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (database: string, options: FirestoreOptions) => {
diff --git a/src/commands/firestore-databases-get.ts b/src/commands/firestore-databases-get.ts
index 88888b451f5..afe2ed0e9bb 100644
--- a/src/commands/firestore-databases-get.ts
+++ b/src/commands/firestore-databases-get.ts
@@ -9,7 +9,7 @@ import { FirestoreOptions } from "../firestore/options";
 import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:databases:get [database]")
-  .description("Get database in your Cloud Firestore project.")
+  .description("get information about a Cloud Firestore database")
   .before(requirePermissions, ["datastore.databases.get"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (database: string, options: FirestoreOptions) => {
diff --git a/src/commands/firestore-databases-list.ts b/src/commands/firestore-databases-list.ts
index 6fb049624df..07c50d4180f 100644
--- a/src/commands/firestore-databases-list.ts
+++ b/src/commands/firestore-databases-list.ts
@@ -9,7 +9,7 @@ import { FirestoreOptions } from "../firestore/options";
 import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:databases:list")
-  .description("List databases in your Cloud Firestore project.")
+  .description("list the Cloud Firestore databases on your project")
   .before(requirePermissions, ["datastore.databases.list"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (options: FirestoreOptions) => {
diff --git a/src/commands/firestore-databases-restore.ts b/src/commands/firestore-databases-restore.ts
index b526c532ede..6cd278248e8 100644
--- a/src/commands/firestore-databases-restore.ts
+++ b/src/commands/firestore-databases-restore.ts
@@ -12,19 +12,19 @@ import { PrettyPrint } from "../firestore/pretty-print";
 import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:databases:restore")
-  .description("Restore a Firestore database in your Firebase project.")
+  .description("restore a Firestore database from a backup")
   .option("-d, --database <databaseID>", "ID of the database to restore into")
-  .option("-b, --backup <backup>", "Backup from which to restore")
+  .option("-b, --backup <backup>", "backup from which to restore")
   .option(
     "-e, --encryption-type <encryptionType>",
-    `Encryption method of the restored database; one of ${EncryptionType.USE_SOURCE_ENCRYPTION} (default), ` +
+    `encryption method of the restored database; one of ${EncryptionType.USE_SOURCE_ENCRYPTION} (default), ` +
       `${EncryptionType.CUSTOMER_MANAGED_ENCRYPTION}, ${EncryptionType.GOOGLE_DEFAULT_ENCRYPTION}`,
   )
   // TODO(b/356137854): Remove allowlist only message once feature is public GA.
   .option(
     "-k, --kms-key-name <kmsKeyName>",
-    "Resource ID of the Cloud KMS key to encrypt the restored database. This " +
-      "feature is allowlist only in initial launch.",
+    "resource ID of the Cloud KMS key to encrypt the restored database. This " +
+      "feature is allowlist only in initial launch",
   )
   .before(requirePermissions, ["datastore.backups.restoreDatabase"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
diff --git a/src/commands/firestore-databases-update.ts b/src/commands/firestore-databases-update.ts
index 6242a26e473..88ca73c1063 100644
--- a/src/commands/firestore-databases-update.ts
+++ b/src/commands/firestore-databases-update.ts
@@ -13,16 +13,16 @@ import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:databases:update <database>")
   .description(
-    "Update a database in your Firebase project. Must specify at least one property to update.",
+    "update a database in your Firebase project. Must specify at least one property to update",
   )
-  .option("--json", "Prints raw json response of the create API call if specified")
+  .option("--json", "prints raw json response of the create API call if specified")
   .option(
     "--delete-protection <deleteProtectionState>",
-    "Whether or not to prevent deletion of database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'",
+    "whether or not to prevent deletion of database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'",
   )
   .option(
     "--point-in-time-recovery <enablement>",
-    "Whether to enable the PITR feature on this database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'",
+    "whether to enable the PITR feature on this database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'",
   )
   .before(requirePermissions, ["datastore.databases.update"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
diff --git a/src/commands/firestore-delete.ts b/src/commands/firestore-delete.ts
index e0e284620ad..b9caa788505 100644
--- a/src/commands/firestore-delete.ts
+++ b/src/commands/firestore-delete.ts
@@ -67,24 +67,20 @@ function confirmationMessage(deleteOp: FirestoreDelete, options: FirestoreOption
 }
 
 export const command = new Command("firestore:delete [path]")
-  .description("Delete data from Cloud Firestore.")
+  .description("delete data from a Cloud Firestore database")
   .option(
     "-r, --recursive",
-    "Recursive. Delete all documents and subcollections at and under the " +
-      "specified level. May not be passed along with --shallow.",
+    "if set, recursively delete all documents and subcollections at and under the " +
+      "specified level. May not be passed along with --shallow",
   )
   .option(
     "--shallow",
-    "Shallow. Delete only documents at the specified level and ignore documents in " +
+    "delete only documents at the specified level and ignore documents in " +
       "subcollections. This action can potentially orphan documents nested in " +
-      "subcollections. May not be passed along with -r.",
+      "subcollections. May not be passed along with -r",
   )
-  .option(
-    "--all-collections",
-    "Delete all. Deletes the entire Firestore database, " +
-      "including all collections and documents. Any other flags or arguments will be ignored.",
-  )
-  .option("-f, --force", "No confirmation. Otherwise, a confirmation prompt will appear.")
+  .option("--all-collections", "deletes all collections and documents in the Firestore database")
+  .withForce()
   .option(
     "--database <databaseId>",
     'Database ID for database to delete from. "(default)" if none is provided.',
diff --git a/src/commands/firestore-indexes-list.ts b/src/commands/firestore-indexes-list.ts
index 135403304df..6ec7e04cc0f 100644
--- a/src/commands/firestore-indexes-list.ts
+++ b/src/commands/firestore-indexes-list.ts
@@ -11,15 +11,15 @@ import { PrettyPrint } from "../firestore/pretty-print";
 import { needProjectId } from "../projectUtils";
 
 export const command = new Command("firestore:indexes")
-  .description("List indexes in your project's Cloud Firestore database.")
+  .description("list indexes in a Cloud Firestore database")
   .option(
     "--pretty",
-    "Pretty print. When not specified the indexes are printed in the " +
-      "JSON specification format.",
+    "pretty print the indexes. When not specified the indexes are printed in the " +
+      "JSON specification format",
   )
   .option(
     "--database <databaseId>",
-    "Database ID of the firestore database from which to list indexes. (default) if none provided.",
+    "database ID of the firestore database from which to list indexes. (default) if none provided",
   )
   .before(requirePermissions, ["datastore.indexes.list"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
diff --git a/src/commands/firestore-locations.ts b/src/commands/firestore-locations.ts
index 13e7e10e51e..4cfffcb2a1d 100644
--- a/src/commands/firestore-locations.ts
+++ b/src/commands/firestore-locations.ts
@@ -9,7 +9,7 @@ import { FirestoreOptions } from "../firestore/options";
 import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:locations")
-  .description("List possible locations for your Cloud Firestore project.")
+  .description("list possible locations for your Cloud Firestore database")
   .before(requirePermissions, ["datastore.locations.list"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (options: FirestoreOptions) => {
diff --git a/src/commands/functions-artifacts-setpolicy.ts b/src/commands/functions-artifacts-setpolicy.ts
index 7476c936861..2317f9fee47 100644
--- a/src/commands/functions-artifacts-setpolicy.ts
+++ b/src/commands/functions-artifacts-setpolicy.ts
@@ -15,24 +15,24 @@ import * as artifacts from "../functions/artifacts";
  */
 export const command = new Command("functions:artifacts:setpolicy")
   .description(
-    "Set up a cleanup policy for Cloud Run functions container images in Artifact Registry. " +
-      "This policy will automatically delete old container images created during functions deployment.",
+    "set up a cleanup policy for Cloud Run functions container images in Artifact Registry " +
+      "to automatically delete old function images",
   )
   .option(
     "--location <location>",
-    "Specify location to set up the cleanup policy. " +
-      "If omitted, uses the default functions location.",
+    "specify location to set up the cleanup policy. " +
+      "If omitted, uses the default functions location",
     "us-central1",
   )
   .option(
     "--days <days>",
-    `Number of days to keep container images before deletion. Default is ${artifacts.DEFAULT_CLEANUP_DAYS} day.`,
+    `number of days to keep container images before deletion. Default is ${artifacts.DEFAULT_CLEANUP_DAYS} day`,
   )
   .option(
     "--none",
-    "Opt-out from cleanup policy. This will prevent suggestions to set up a cleanup policy during initialization and deployment.",
+    "opt-out from cleanup policy. This will prevent suggestions to set up a cleanup policy during initialization and deployment",
   )
-  .withForce("Automatically create or modify cleanup policy")
+  .withForce("automatically create or modify cleanup policy")
   .before(requireAuth)
   .before(async (options) => {
     const projectId = needProjectId(options);
diff --git a/src/commands/functions-config-export.ts b/src/commands/functions-config-export.ts
index dd4e58c34ac..313421f1fdb 100644
--- a/src/commands/functions-config-export.ts
+++ b/src/commands/functions-config-export.ts
@@ -94,7 +94,7 @@ function fromEntries<V>(itr: Iterable<[string, V]>): Record<string, V> {
 }
 
 export const command = new Command("functions:config:export")
-  .description("Export environment config as environment variables in dotenv format")
+  .description("export environment config as environment variables in dotenv format")
   .before(requirePermissions, [
     "runtimeconfig.configs.list",
     "runtimeconfig.configs.get",
diff --git a/src/commands/functions-deletegcfartifacts.ts b/src/commands/functions-deletegcfartifacts.ts
index 4368254130b..61c15bdef1f 100644
--- a/src/commands/functions-deletegcfartifacts.ts
+++ b/src/commands/functions-deletegcfartifacts.ts
@@ -21,7 +21,7 @@ function getConfirmationMessage(paths: string[]): string {
 
 export const command = new Command("functions:deletegcfartifacts")
   .description(
-    "Deletes all artifacts created by Google Cloud Functions on Google Container Registry.",
+    "deletes all artifacts created by Google Cloud Functions on Google Container Registry",
   )
   .option(
     "--regions <regions>",
diff --git a/src/commands/functions-secrets-access.ts b/src/commands/functions-secrets-access.ts
index 3bb5606f84a..96866736454 100644
--- a/src/commands/functions-secrets-access.ts
+++ b/src/commands/functions-secrets-access.ts
@@ -9,7 +9,7 @@ import { getSecretNameParts } from "../apphosting/secrets";
 
 export const command = new Command("functions:secrets:access <KEY>[@version]")
   .description(
-    "Access secret value given secret and its version. Defaults to accessing the latest version.",
+    "access secret value given secret and its version. Defaults to accessing the latest version",
   )
   .before(requireAuth)
   .before(secretManager.ensureApi)
diff --git a/src/commands/functions-secrets-describe.ts b/src/commands/functions-secrets-describe.ts
index 4c699ea0571..d9c3ea3a8b3 100644
--- a/src/commands/functions-secrets-describe.ts
+++ b/src/commands/functions-secrets-describe.ts
@@ -6,7 +6,7 @@ import * as secrets from "../functions/secrets";
 
 export const command = new Command("functions:secrets:describe <KEY>")
   .description(
-    "Get metadata for secret and its versions. Alias for functions:secrets:get to align with gcloud",
+    "get metadata for secret and its versions. Alias for functions:secrets:get to align with gcloud",
   )
   .before(requireAuth)
   .before(secretManager.ensureApi)
diff --git a/src/commands/functions-secrets-destroy.ts b/src/commands/functions-secrets-destroy.ts
index 077456216d5..084452c7d60 100644
--- a/src/commands/functions-secrets-destroy.ts
+++ b/src/commands/functions-secrets-destroy.ts
@@ -18,8 +18,8 @@ import * as backend from "../deploy/functions/backend";
 import * as args from "../deploy/functions/args";
 
 export const command = new Command("functions:secrets:destroy <KEY>[@version]")
-  .description("Destroy a secret. Defaults to destroying the latest version.")
-  .withForce("Destroys a secret without confirmation.")
+  .description("destroy a secret. Defaults to destroying the latest version")
+  .withForce("destroy a secret without confirmation")
   .before(requireAuth)
   .before(ensureApi)
   .action(async (key: string, options: Options) => {
diff --git a/src/commands/functions-secrets-get.ts b/src/commands/functions-secrets-get.ts
index 611ad101f22..cb60cf81efc 100644
--- a/src/commands/functions-secrets-get.ts
+++ b/src/commands/functions-secrets-get.ts
@@ -5,7 +5,7 @@ import * as secretManager from "../gcp/secretManager";
 import * as secrets from "../functions/secrets";
 
 export const command = new Command("functions:secrets:get <KEY>")
-  .description("Get metadata for secret and its versions")
+  .description("get metadata for secret and its versions")
   .before(requireAuth)
   .before(secretManager.ensureApi)
   .before(requirePermissions, ["secretmanager.secrets.get"])
diff --git a/src/commands/functions-secrets-prune.ts b/src/commands/functions-secrets-prune.ts
index 99e03e96ab6..992e74e0cdd 100644
--- a/src/commands/functions-secrets-prune.ts
+++ b/src/commands/functions-secrets-prune.ts
@@ -14,8 +14,8 @@ import { destroySecretVersion } from "../gcp/secretManager";
 import { requireAuth } from "../requireAuth";
 
 export const command = new Command("functions:secrets:prune")
-  .withForce("Destroys unused secrets without prompt")
-  .description("Destroys unused secrets")
+  .withForce("destroy unused secrets without prompt")
+  .description("destroy unused secrets")
   .before(requireAuth)
   .before(secretManager.ensureApi)
   .before(requirePermissions, [
diff --git a/src/commands/functions-secrets-set.ts b/src/commands/functions-secrets-set.ts
index 61ae8ee1a2d..d815fb9c7e8 100644
--- a/src/commands/functions-secrets-set.ts
+++ b/src/commands/functions-secrets-set.ts
@@ -22,8 +22,8 @@ import * as backend from "../deploy/functions/backend";
 import * as args from "../deploy/functions/args";
 
 export const command = new Command("functions:secrets:set <KEY>")
-  .description("Create or update a secret for use in Cloud Functions for Firebase.")
-  .withForce("Automatically updates functions to use the new secret.")
+  .description("create or update a secret for use in Cloud Functions for Firebase")
+  .withForce("automatically updates functions to use the new secret")
   .before(requireAuth)
   .before(ensureApi)
   .before(requirePermissions, [
@@ -34,7 +34,7 @@ export const command = new Command("functions:secrets:set <KEY>")
   ])
   .option(
     "--data-file <dataFile>",
-    'File path from which to read secret data. Set to "-" to read the secret data from stdin.',
+    'file path from which to read secret data. Set to "-" to read the secret data from stdin',
   )
   .action(async (unvalidatedKey: string, options: Options) => {
     const projectId = needProjectId(options);
diff --git a/src/commands/index.ts b/src/commands/index.ts
index 4cf6298495a..484b3727167 100644
--- a/src/commands/index.ts
+++ b/src/commands/index.ts
@@ -76,9 +76,6 @@ export function load(client: any): any {
   client.emulators.exec = loadCommand("emulators-exec");
   client.emulators.export = loadCommand("emulators-export");
   client.emulators.start = loadCommand("emulators-start");
-  client.experimental = {};
-  client.experimental.functions = {};
-  client.experimental.functions.shell = loadCommand("experimental-functions-shell");
   client.experiments = {};
   client.experiments.list = loadCommand("experiments-list");
   client.experiments.describe = loadCommand("experiments-describe");
diff --git a/src/commands/init.ts b/src/commands/init.ts
index 050fab4d3a1..704c41b1ab4 100644
--- a/src/commands/init.ts
+++ b/src/commands/init.ts
@@ -109,7 +109,7 @@ if (isEnabled("genkit")) {
 
 const featureNames = choices.map((choice) => choice.value);
 
-const DESCRIPTION = `Interactively configure the current directory as a Firebase project or initialize new features in an already configured Firebase project directory.
+const HELP = `Interactively configure the current directory as a Firebase project or initialize new features in an already configured Firebase project directory.
 
 This command will create or update 'firebase.json' and '.firebaserc' configuration files in the current directory.
 
@@ -120,7 +120,8 @@ ${[...featureNames]
   .join("")}`;
 
 export const command = new Command("init [feature]")
-  .description(DESCRIPTION)
+  .description("interactively configure the current directory as a Firebase project directory")
+  .help(HELP)
   .before(requireAuth)
   .action(initAction);
 
diff --git a/src/commands/internaltesting-frameworks-compose.ts b/src/commands/internaltesting-frameworks-compose.ts
index 1cf9a0fe71e..9b8ff7dbfa7 100644
--- a/src/commands/internaltesting-frameworks-compose.ts
+++ b/src/commands/internaltesting-frameworks-compose.ts
@@ -8,7 +8,7 @@ import { LocalFileSystem } from "../frameworks/compose/discover/filesystem";
 import { frameworkSpecs } from "../frameworks/compose/discover/frameworkSpec";
 
 export const command = new Command("internaltesting:frameworks:compose")
-  .option("-m, --mode <mode>", "Composer mode (local or docker)", "local")
+  .option("-m, --mode <mode>", "composer mode (local or docker)", "local")
   .description("compose framework in current directory")
   .action(async (options: Options) => {
     const mode = options.mode as string;
diff --git a/src/commands/remoteconfig-versions-list.ts b/src/commands/remoteconfig-versions-list.ts
index cfc044c2cf8..367b99f901d 100644
--- a/src/commands/remoteconfig-versions-list.ts
+++ b/src/commands/remoteconfig-versions-list.ts
@@ -24,7 +24,7 @@ export const command = new Command("remoteconfig:versions:list")
   )
   .option(
     "--limit <maxResults>",
-    "limit the number of versions being returned. Pass '0' to fetch all versions.",
+    "limit the number of versions being returned. Pass '0' to fetch all versions",
   )
   .before(requireAuth)
   .before(requirePermissions, ["cloudconfig.configs.get"])
diff --git a/src/commands/setup-emulators-database.ts b/src/commands/setup-emulators-database.ts
index c559b76927f..8b30804a4d3 100644
--- a/src/commands/setup-emulators-database.ts
+++ b/src/commands/setup-emulators-database.ts
@@ -5,7 +5,7 @@ import { Emulators } from "../emulator/types";
 const NAME = Emulators.DATABASE;
 
 export const command = new Command(`setup:emulators:${NAME}`)
-  .description(`downloads the ${NAME} emulator`)
+  .description(`download the ${NAME} emulator`)
   .action(() => {
     return downloadEmulator(NAME);
   });
diff --git a/src/commands/setup-emulators-dataconnect.ts b/src/commands/setup-emulators-dataconnect.ts
index b678145a6c4..aa2475c71db 100644
--- a/src/commands/setup-emulators-dataconnect.ts
+++ b/src/commands/setup-emulators-dataconnect.ts
@@ -7,7 +7,7 @@ import { downloadIfNecessary } from "../emulator/downloadableEmulators";
 const NAME = Emulators.DATACONNECT;
 
 export const command = new Command(`setup:emulators:${NAME}`)
-  .description(`downloads the ${NAME} emulator`)
+  .description(`download the ${NAME} emulator`)
   .action(async (options: Options) => {
     await downloadIfNecessary(NAME);
     if (!options.config) {
diff --git a/src/commands/setup-emulators-firestore.ts b/src/commands/setup-emulators-firestore.ts
index 81119bab092..bf1a21f32c9 100644
--- a/src/commands/setup-emulators-firestore.ts
+++ b/src/commands/setup-emulators-firestore.ts
@@ -5,7 +5,7 @@ import { Emulators } from "../emulator/types";
 const NAME = Emulators.FIRESTORE;
 
 export const command = new Command(`setup:emulators:${NAME}`)
-  .description(`downloads the ${NAME} emulator`)
+  .description(`download the ${NAME} emulator`)
   .action(() => {
     return downloadEmulator(NAME);
   });
diff --git a/src/commands/setup-emulators-pubsub.ts b/src/commands/setup-emulators-pubsub.ts
index 79bd76d0bbc..932f3026bba 100644
--- a/src/commands/setup-emulators-pubsub.ts
+++ b/src/commands/setup-emulators-pubsub.ts
@@ -5,7 +5,7 @@ import { Emulators } from "../emulator/types";
 const EMULATOR_NAME = Emulators.PUBSUB;
 
 export const command = new Command(`setup:emulators:${EMULATOR_NAME}`)
-  .description(`downloads the ${EMULATOR_NAME} emulator`)
+  .description(`download the ${EMULATOR_NAME} emulator`)
   .action(() => {
     return downloadEmulator(EMULATOR_NAME);
   });
diff --git a/src/commands/setup-emulators-storage.ts b/src/commands/setup-emulators-storage.ts
index 9d094035a25..492a959e33a 100644
--- a/src/commands/setup-emulators-storage.ts
+++ b/src/commands/setup-emulators-storage.ts
@@ -5,7 +5,7 @@ import { Emulators } from "../emulator/types";
 const EMULATOR_NAME = Emulators.STORAGE;
 
 export const command = new Command(`setup:emulators:${EMULATOR_NAME}`)
-  .description(`downloads the ${EMULATOR_NAME} emulator`)
+  .description(`download the ${EMULATOR_NAME} emulator`)
   .action(() => {
     return downloadEmulator(EMULATOR_NAME);
   });
diff --git a/src/commands/setup-emulators-ui.ts b/src/commands/setup-emulators-ui.ts
index a6ec04e7da6..6f17b46fc16 100644
--- a/src/commands/setup-emulators-ui.ts
+++ b/src/commands/setup-emulators-ui.ts
@@ -5,7 +5,7 @@ import { Emulators } from "../emulator/types";
 const NAME = Emulators.UI;
 
 export const command = new Command(`setup:emulators:${NAME}`)
-  .description(`downloads the ${NAME} emulator`)
+  .description(`download the ${NAME} emulator`)
   .action(() => {
     return downloadEmulator(NAME);
   });