diff --git a/client/config.go b/client/config.go
index 784ae0590b..b766106387 100644
--- a/client/config.go
+++ b/client/config.go
@@ -57,7 +57,6 @@ func runConfigCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	// var chainID string
 	chainID, err := types.DefaultChainID()
 
 	if err != nil {
diff --git a/cmd/gaia/cmd/gaiacli/query.go b/cmd/gaia/cmd/gaiacli/query.go
index 91734a8259..051d9427ae 100644
--- a/cmd/gaia/cmd/gaiacli/query.go
+++ b/cmd/gaia/cmd/gaiacli/query.go
@@ -24,7 +24,7 @@ func queryCmd(cdc *amino.Codec) *cobra.Command {
 	// Group staking queries under a subcommand
 	stakeQueryCmd := &cobra.Command{
 		Use:   "stake",
-		Short: "Querying commands for staking module",
+		Short: "Querying commands for the staking module",
 	}
 
 	stakeQueryCmd.AddCommand(client.GetCommands(
@@ -44,7 +44,7 @@ func queryCmd(cdc *amino.Codec) *cobra.Command {
 	// Group gov queries under a subcommand
 	govQueryCmd := &cobra.Command{
 		Use:   "gov",
-		Short: "Querying commands for gov module",
+		Short: "Querying commands for the governance module",
 	}
 
 	govQueryCmd.AddCommand(client.GetCommands(
@@ -58,7 +58,7 @@ func queryCmd(cdc *amino.Codec) *cobra.Command {
 	// Group slashing queries under a subcommand
 	slashingQueryCmd := &cobra.Command{
 		Use:   "slashing",
-		Short: "Querying commands for slashing module",
+		Short: "Querying commands for the slashing module",
 	}
 
 	slashingQueryCmd.AddCommand(client.GetCommands(
diff --git a/cmd/gaia/cmd/gaiacli/tx.go b/cmd/gaia/cmd/gaiacli/tx.go
index 892e6ae7c4..fa0abc4ad8 100644
--- a/cmd/gaia/cmd/gaiacli/tx.go
+++ b/cmd/gaia/cmd/gaiacli/tx.go
@@ -22,7 +22,7 @@ func txCmd(cdc *amino.Codec) *cobra.Command {
 
 	stakeTxCmd := &cobra.Command{
 		Use:   "stake",
-		Short: "Stake Transactions subcommands",
+		Short: "Staking transaction subcommands",
 	}
 
 	stakeTxCmd.AddCommand(client.PostCommands(
@@ -35,7 +35,7 @@ func txCmd(cdc *amino.Codec) *cobra.Command {
 
 	distTxCmd := &cobra.Command{
 		Use:   "dist",
-		Short: "Distribution Transactions subcommands",
+		Short: "Distribution transactions subcommands",
 	}
 
 	distTxCmd.AddCommand(client.PostCommands(
@@ -45,7 +45,7 @@ func txCmd(cdc *amino.Codec) *cobra.Command {
 
 	govTxCmd := &cobra.Command{
 		Use:   "gov",
-		Short: "Governance Transactions subcommands",
+		Short: "Governance transactions subcommands",
 	}
 
 	govTxCmd.AddCommand(client.PostCommands(
@@ -56,7 +56,7 @@ func txCmd(cdc *amino.Codec) *cobra.Command {
 
 	slashingTxCmd := &cobra.Command{
 		Use:   "slashing",
-		Short: "Slashing Transactions subcommands",
+		Short: "Slashing transactions subcommands",
 	}
 
 	slashingTxCmd.AddCommand(client.PostCommands(