diff --git a/cli/bundle-uninstall.go b/cli/bundle-uninstall.go
index d5e7a7b..efd881f 100644
--- a/cli/bundle-uninstall.go
+++ b/cli/bundle-uninstall.go
@@ -40,16 +40,16 @@ const (
 	bundleUninstallShort = "Uninstall bundles"
 	bundleUninstallLong  = `Uninstall bundles.`
 	bundleUninstallUsage = `Usage:
-   gort bundle uninstall [flags] bundle_name [version]
+  gort bundle uninstall [flags] bundle_name [version]
 
- Flags:
-   -a, --all     Uninstall all versions of the bundle
-   -c, --clean   Uninstall all disabled bundle versions
-   -h, --help    help for uninstall
+Flags:
+  -a, --all     Uninstall all versions of the bundle
+  -c, --clean   Uninstall all disabled bundle versions
+  -h, --help    help for uninstall
 
- Global Flags:
-   -P, --profile string   The Gort profile within the config file to use
- `
+Global Flags:
+  -P, --profile string   The Gort profile within the config file to use
+`
 )
 
 var (
diff --git a/cli/config-delete.go b/cli/config-delete.go
index 373d297..72ef6c5 100644
--- a/cli/config-delete.go
+++ b/cli/config-delete.go
@@ -28,19 +28,19 @@ const (
 	configDeleteUse   = "delete"
 	configDeleteShort = "Delete a configuration value"
 	configDeleteLong  = "Delete a configuration value."
-
 	configDeleteUsage = `Usage:
- gort config delete [-b bundle] [-l layer] [-o owner] [-k key]
-
- Flags:
- -b, --bundle string   The bundle to configure (required)
- -h, --help            Show this message and exit
- -k, --key string      The name of the configuration
- -l, --layer string    One of: [bundle room group user] (default "bundle")
- -o, --owner string    The owning room, group, or user
-
- Global Flags:
- -P, --profile string   The Gort profile within the config file to use`
+  gort config delete [-b bundle] [-l layer] [-o owner] [-k key]
+
+Flags:
+  -b, --bundle string   The bundle to configure (required)
+  -h, --help            Show this message and exit
+  -k, --key string      The name of the configuration
+  -l, --layer string    One of: [bundle room group user] (default "bundle")
+  -o, --owner string    The owning room, group, or user
+
+Global Flags:
+  -P, --profile string   The Gort profile within the config file to use
+`
 )
 
 var (
diff --git a/cli/config-get.go b/cli/config-get.go
index 864f33f..daedbdf 100644
--- a/cli/config-get.go
+++ b/cli/config-get.go
@@ -40,19 +40,19 @@ by the owning user, or by a Gort administrator.
 
 Configurations set to "secret" cannot be retrieved.
 `
-
 	configGetUsage = `Usage:
- gort config get [-b bundle] [-l layer] [-o owner] [-k key] [flags]
+  gort config get [-b bundle] [-l layer] [-o owner] [-k key] [flags]
 
- Flags:
- -b, --bundle string   The bundle to configure (required)
- -h, --help            Show this message and exit
- -k, --key string      The name of the configuration
- -l, --layer string    One of: [bundle room group user] (default "bundle")
- -o, --owner string    The owning room, group, or user
+Flags:
+  -b, --bundle string   The bundle to configure (required)
+  -h, --help            Show this message and exit
+  -k, --key string      The name of the configuration
+  -l, --layer string    One of: [bundle room group user] (default "bundle")
+  -o, --owner string    The owning room, group, or user
 
- Global Flags:
- -P, --profile string   The Gort profile within the config file to use`
+Global Flags:
+  -P, --profile string   The Gort profile within the config file to use
+`
 )
 
 var (
diff --git a/cli/config-set.go b/cli/config-set.go
index 7e27143..c054eb4 100644
--- a/cli/config-set.go
+++ b/cli/config-set.go
@@ -30,21 +30,21 @@ const (
 	configSetLong  = `Set or update a dynamic configuration value, which can be injected into
 commands' environments at execution time with the same name as the key.
 
-Dynamic configuration keys may not start with "GORT_".`
-
+Dynamic configuration keys may not start with "GORT_".
+`
 	configSetUsage = `Usage:
- gort config set [-b bundle] [-l layer] [-o owner] [-k key] [-s secret] [flags] config_value
-
- Flags:
- -b, --bundle string   The bundle to configure (required)
- -h, --help            Show this message and exit
- -k, --key string      The name of the configuration
- -l, --layer string    One of: [bundle room group user] (default "bundle")
- -o, --owner string    The owning room, group, or user
- -s, --secret          Makes a configuration value secret
-
- Global Flags:
- -P, --profile string   The Gort profile within the config file to use
+  gort config set [-b bundle] [-l layer] [-o owner] [-k key] [-s secret] [flags] config_value
+
+Flags:
+  -b, --bundle string   The bundle to configure (required)
+  -h, --help            Show this message and exit
+  -k, --key string      The name of the configuration
+  -l, --layer string    One of: [bundle room group user] (default "bundle")
+  -o, --owner string    The owning room, group, or user
+  -s, --secret          Makes a configuration value secret
+
+Global Flags:
+  -P, --profile string   The Gort profile within the config file to use
 `
 )
 
diff --git a/cli/hidden-whoami.go b/cli/hidden-whoami.go
index 9845d99..5722f6e 100644
--- a/cli/hidden-whoami.go
+++ b/cli/hidden-whoami.go
@@ -28,11 +28,11 @@ const (
 	hiddenWhoamiShort = "Provides your basic identity and account information"
 	hiddenWhoamiLong  = `Provides your basic identity and account information.`
 	hiddenWhoamiUsage = `Usage:
-	!gort:whoami
+  !gort:whoami
 
-  Flags:
-	-h, --help   Show this message and exit
-  `
+Flags:
+  -h, --help   Show this message and exit
+`
 )
 
 // GetHiddenWhoamiCmd is a command
diff --git a/cli/user-map.go b/cli/user-map.go
index 74058dd..51f6106 100644
--- a/cli/user-map.go
+++ b/cli/user-map.go
@@ -36,17 +36,17 @@ accessible in Slack via View Full Profile -> More -> Copy Member ID. It looks
 something like U01234567AB.
 
 A Gort user can only be mapped to one ID per adapter, and each adapter:ID pair
-can only be mapped to one Gort user.`
-
+can only be mapped to one Gort user.
+`
 	userMapUsage = `Usage:
-   gort user map [flags] username adapter_name [chat_user_id]
+  gort user map [flags] username adapter_name [chat_user_id]
 
- Flags:
-   -D, --delete   Delete a mapping instead of creating
-   -h, --help     Show this message and exit
+Flags:
+  -D, --delete   Delete a mapping instead of creating
+  -h, --help     Show this message and exit
 
- Global Flags:
-   -P, --profile string   The Gort profile within the config file to use
+Global Flags:
+  -P, --profile string   The Gort profile within the config file to use
 `
 )