diff --git a/cmds/filesystem.c b/cmds/filesystem.c
index 144d4517..6c1b6908 100644
--- a/cmds/filesystem.c
+++ b/cmds/filesystem.c
@@ -631,6 +631,7 @@ static const char * const cmd_filesystem_show_usage[] = {
 	"-d|--all-devices   show only disks under /dev containing btrfs filesystem",
 	"-m|--mounted       show only mounted btrfs",
 	HELPINFO_UNITS_LONG,
+	"",
 	"If no argument is given, structure of all present filesystems is shown.",
 	NULL
 };
@@ -840,9 +841,9 @@ static const char * const cmd_filesystem_defrag_usage[] = {
 	"-l len              defragment only up to len bytes",
 	"-t size             target extent size hint (default: 32M)",
 	"-v                  deprecated, alias for global -v option",
-	"",
 	HELPINFO_INSERT_GLOBALS,
 	HELPINFO_INSERT_VERBOSE,
+	"",
 	"Warning: most Linux kernels will break up the ref-links of COW data",
 	"(e.g., files copied with 'cp --reflink', snapshots) which may cause",
 	"considerable increase of space usage. See btrfs-filesystem(8) for",
diff --git a/cmds/replace.c b/cmds/replace.c
index 2321aa15..84fcb80e 100644
--- a/cmds/replace.c
+++ b/cmds/replace.c
@@ -325,8 +325,7 @@ static DEFINE_SIMPLE_COMMAND(replace_start, "start");
 
 static const char *const cmd_replace_status_usage[] = {
 	"btrfs replace status [-1] <mount_point>",
-	"Print status and progress information of a running device replace",
-	"operation",
+	"Print status and progress information of a running device replace operation",
 	"",
 	"-1     print once instead of print continuously until the replace",
 	"       operation finishes (or is canceled)",
diff --git a/cmds/rescue.c b/cmds/rescue.c
index 1ae009a3..fa44322f 100644
--- a/cmds/rescue.c
+++ b/cmds/rescue.c
@@ -37,8 +37,8 @@ static const char * const cmd_rescue_chunk_recover_usage[] = {
 	"btrfs rescue chunk-recover [options] <device>",
 	"Recover the chunk tree by scanning the devices one by one.",
 	"",
-	"-y	Assume an answer of `yes' to all questions",
-	"-h	Help",
+	"-y     Assume an answer of `yes' to all questions",
+	"-h     Help",
 	"-v     deprecated, alias for global -v option",
 	HELPINFO_INSERT_GLOBALS,
 	HELPINFO_INSERT_VERBOSE,
@@ -105,7 +105,7 @@ static const char * const cmd_rescue_super_recover_usage[] = {
 	"btrfs rescue super-recover [options] <device>",
 	"Recover bad superblocks from good copies",
 	"",
-	"-y	Assume an answer of `yes' to all questions",
+	"-y     Assume an answer of `yes' to all questions",
 	"-v     deprecated, alias for global -v option",
 	HELPINFO_INSERT_GLOBALS,
 	HELPINFO_INSERT_VERBOSE,
diff --git a/cmds/subvolume.c b/cmds/subvolume.c
index 77f297fa..2020e486 100644
--- a/cmds/subvolume.c
+++ b/cmds/subvolume.c
@@ -979,8 +979,8 @@ static const char * const cmd_subvol_show_usage[] = {
 	"btrfs subvolume show [options] <path>",
 	"Show more information about the subvolume (UUIDs, generations, times, snapshots)",
 	"",
-	"-r|--rootid   rootid of the subvolume",
-	"-u|--uuid     uuid of the subvolume",
+	"-r|--rootid        rootid of the subvolume",
+	"-u|--uuid          uuid of the subvolume",
 	HELPINFO_UNITS_SHORT_LONG,
 	"",
 	"If no option is specified, subvolume at <path> will be shown, otherwise",