diff --git a/cli/cmd/root.go b/cli/cmd/root.go
index 614e30a4b..169f88aaf 100644
--- a/cli/cmd/root.go
+++ b/cli/cmd/root.go
@@ -45,9 +45,9 @@ func NewRootCmd() *cobra.Command {
 	rootCmd.AddCommand(cmd.NewCreateCmd())
 	rootCmd.AddCommand(cmd.NewInitCmd())
 	rootCmd.AddCommand(cmd.NewVerifyCmd())
+	rootCmd.AddCommand(cmd.NewUpgradeCmd())
 	rootCmd.AddCommand(cmd.NewRecoverCmd())
 	rootCmd.AddCommand(cmd.NewTerminateCmd())
-	rootCmd.AddCommand(cmd.NewUpgradeCmd())
 	rootCmd.AddCommand(cmd.NewVersionCmd())
 
 	return rootCmd
diff --git a/cli/internal/cmd/config.go b/cli/internal/cmd/config.go
index 8a107c429..22bacfc6e 100644
--- a/cli/internal/cmd/config.go
+++ b/cli/internal/cmd/config.go
@@ -14,7 +14,7 @@ func NewConfigCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "config",
 		Short: "Work with the Constellation configuration file",
-		Long:  "Generate a configuration file for Constellation.",
+		Long:  "Work with the Constellation configuration file.",
 		Args:  cobra.ExactArgs(0),
 	}
 
diff --git a/cli/internal/cmd/configgenerate.go b/cli/internal/cmd/configgenerate.go
index 65e4ec9f9..19174a942 100644
--- a/cli/internal/cmd/configgenerate.go
+++ b/cli/internal/cmd/configgenerate.go
@@ -68,8 +68,8 @@ func configGenerate(cmd *cobra.Command, fileHandler file.Handler, provider cloud
 		return err
 	}
 	cmd.Println("Config file written to", flags.file)
-	cmd.Println("Please fill in your CSP specific configuration before proceeding.")
-	cmd.Println("Fore more information refer to our documentation:")
+	cmd.Println("Please fill in your CSP-specific configuration before proceeding.")
+	cmd.Println("Fore more information refer to the documentation:")
 	cmd.Println("\thttps://constellation-docs.edgeless.systems/constellation/getting-started/first-steps#create-a-cluster")
 
 	return nil
diff --git a/cli/internal/cmd/configinstancetypes.go b/cli/internal/cmd/configinstancetypes.go
index 3d95b7926..422ce4a40 100644
--- a/cli/internal/cmd/configinstancetypes.go
+++ b/cli/internal/cmd/configinstancetypes.go
@@ -17,8 +17,8 @@ import (
 func NewConfigInstanceTypesCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "instance-types",
-		Short: "Prints the supported instance types for all cloud providers",
-		Long:  "Prints the supported instance types for all cloud providers.",
+		Short: "Print the supported instance types for all cloud providers",
+		Long:  "Print the supported instance types for all cloud providers.",
 		Args:  cobra.ArbitraryArgs,
 		Run:   printSupportedInstanceTypes,
 	}
diff --git a/cli/internal/cmd/init.go b/cli/internal/cmd/init.go
index 1aaf11071..1d0b97920 100644
--- a/cli/internal/cmd/init.go
+++ b/cli/internal/cmd/init.go
@@ -138,7 +138,6 @@ func initialize(cmd *cobra.Command, newDialer func(validator *cloudcmd.Validator
 		autoscalingNodeGroups = append(autoscalingNodeGroups, workers.GroupID)
 	}
 
-	cmd.Println("Loading Helm charts ...")
 	helmDeployments, err := helmLoader.Load(stat.CloudProvider)
 	if err != nil {
 		return fmt.Errorf("loading Helm charts: %w", err)
diff --git a/cli/internal/cmd/upgrade.go b/cli/internal/cmd/upgrade.go
index 259699c7b..14cd39208 100644
--- a/cli/internal/cmd/upgrade.go
+++ b/cli/internal/cmd/upgrade.go
@@ -19,8 +19,8 @@ func NewUpgradeCmd() *cobra.Command {
 		Args:  cobra.ExactArgs(0),
 	}
 
-	cmd.AddCommand(newUpgradeExecuteCmd())
 	cmd.AddCommand(newUpgradePlanCmd())
+	cmd.AddCommand(newUpgradeExecuteCmd())
 
 	return cmd
 }
diff --git a/cli/internal/cmd/upgradeplan.go b/cli/internal/cmd/upgradeplan.go
index 9d38fe655..d5107e4c4 100644
--- a/cli/internal/cmd/upgradeplan.go
+++ b/cli/internal/cmd/upgradeplan.go
@@ -45,7 +45,7 @@ func newUpgradePlanCmd() *cobra.Command {
 		RunE:  runUpgradePlan,
 	}
 
-	cmd.Flags().StringP("file", "f", "", "path to output file, or '-' for stdout, leave empty for interactive mode")
+	cmd.Flags().StringP("file", "f", "", "path to output file, or '-' for stdout (omit for interactive mode)")
 
 	return cmd
 }