diff --git a/client/rpc/validators.go b/client/rpc/validators.go
index e05d1c4348..27b7fce99e 100644
--- a/client/rpc/validators.go
+++ b/client/rpc/validators.go
@@ -18,7 +18,7 @@ import (
 func ValidatorCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "validatorset [height]",
-		Short: "Get the full validator set at given height",
+		Short: "Get the full tendermint validator set at given height",
 		Args:  cobra.MaximumNArgs(1),
 		RunE:  printValidators,
 	}
diff --git a/cmd/gaia/cmd/gaiacli/main.go b/cmd/gaia/cmd/gaiacli/main.go
index 4f82d58ad3..136260c760 100644
--- a/cmd/gaia/cmd/gaiacli/main.go
+++ b/cmd/gaia/cmd/gaiacli/main.go
@@ -37,7 +37,6 @@ func main() {
 
 	// add standard rpc commands
 	rpc.AddCommands(rootCmd)
-	rootCmd.AddCommand(client.LineBreak)
 
 	//Add state commands
 	stateCmd := &cobra.Command{
@@ -49,8 +48,30 @@ func main() {
 		rpc.ValidatorCommand(),
 	)
 	tx.AddCommands(stateCmd, cdc)
-	rootCmd.AddCommand(
+
+	//Add IBC commands
+	ibcCmd := &cobra.Command{
+		Use:   "ibc",
+		Short: "Inter-Blockchain Communication subcommands",
+	}
+	ibcCmd.AddCommand(
+		client.PostCommands(
+			ibccmd.IBCTransferCmd(cdc),
+			ibccmd.IBCRelayCmd(cdc),
+		)...)
+
+	advancedCmd := &cobra.Command{
+		Use:   "advanced",
+		Short: "Advanced subcommands",
+	}
+
+	advancedCmd.AddCommand(
 		stateCmd,
+		ibcCmd,
+		lcd.ServeCommand(cdc),
+	)
+	rootCmd.AddCommand(
+		advancedCmd,
 		client.LineBreak,
 	)
 
@@ -75,22 +96,6 @@ func main() {
 		)...)
 	rootCmd.AddCommand(
 		stakeCmd,
-		client.LineBreak,
-	)
-
-	//Add IBC commands
-	ibcCmd := &cobra.Command{
-		Use:   "ibc",
-		Short: "Inter-Blockchain Communication subcommands",
-	}
-	ibcCmd.AddCommand(
-		client.PostCommands(
-			ibccmd.IBCTransferCmd(cdc),
-			ibccmd.IBCRelayCmd(cdc),
-		)...)
-	rootCmd.AddCommand(
-		ibcCmd,
-		client.LineBreak,
 	)
 
 	//Add auth and bank commands
@@ -105,8 +110,6 @@ func main() {
 
 	// add proxy, version and key info
 	rootCmd.AddCommand(
-		client.LineBreak,
-		lcd.ServeCommand(cdc),
 		keys.Commands(),
 		client.LineBreak,
 		version.VersionCmd,
diff --git a/server/util.go b/server/util.go
index da43dabbb1..93dc73469f 100644
--- a/server/util.go
+++ b/server/util.go
@@ -73,12 +73,12 @@ func AddCommands(
 
 	rootCmd.PersistentFlags().String("log_level", ctx.Config.LogLevel, "Log level")
 
-	tendCmd := &cobra.Command{
+	tendermintCmd := &cobra.Command{
 		Use:   "tendermint",
 		Short: "Tendermint subcommands",
 	}
 
-	tendCmd.AddCommand(
+	tendermintCmd.AddCommand(
 		UnsafeResetAllCmd(ctx),
 		ShowNodeIDCmd(ctx),
 		ShowValidatorCmd(ctx),
@@ -88,7 +88,7 @@ func AddCommands(
 		InitCmd(ctx, cdc, appInit),
 		StartCmd(ctx, appCreator),
 		client.LineBreak,
-		tendCmd,
+		tendermintCmd,
 		client.LineBreak,
 		ExportCmd(ctx, cdc, appExport),
 		client.LineBreak,