diff --git a/cmd/file.go b/cmd/file.go
index 11bba84..4b90d8c 100644
--- a/cmd/file.go
+++ b/cmd/file.go
@@ -11,7 +11,7 @@ import (
 // fileCmd represents the file command
 var fileCmd = &cobra.Command{
 	Use:   "file",
-	Short: "file management",
+	Short: "File management",
 	Long: `Let you manage files.
 See https://cobbler.readthedocs.io/en/latest/cobbler.html#cobbler-file for more information.`,
 	Run: func(cmd *cobra.Command, args []string) {
diff --git a/cmd/image.go b/cmd/image.go
index b45beef..0d8c678 100644
--- a/cmd/image.go
+++ b/cmd/image.go
@@ -11,7 +11,7 @@ import (
 // imageCmd represents the image command
 var imageCmd = &cobra.Command{
 	Use:   "image",
-	Short: "image management",
+	Short: "Image management",
 	Long: `Let you manage images.
 See https://cobbler.readthedocs.io/en/latest/cobbler.html#cobbler-image for more information.`,
 	Run: func(cmd *cobra.Command, args []string) {
diff --git a/cmd/list.go b/cmd/list.go
index 2c1ed32..2948072 100644
--- a/cmd/list.go
+++ b/cmd/list.go
@@ -11,7 +11,7 @@ import (
 // listCmd represents the list command
 var listCmd = &cobra.Command{
 	Use:   "list",
-	Short: "List configurations",
+	Short: "List configuration",
 	Long: `Lists all configuration which Cobbler can obtain from the saved data. There are also report subcommands for
 most of the other Cobbler commands (currently: distro, profile, system, repo, image, mgmtclass, package, file, menu).
 Identical to 'cobbler report'`,
diff --git a/cmd/menu.go b/cmd/menu.go
index f6a04f0..a117b0d 100644
--- a/cmd/menu.go
+++ b/cmd/menu.go
@@ -11,7 +11,7 @@ import (
 // menuCmd represents the menu command
 var menuCmd = &cobra.Command{
 	Use:   "menu",
-	Short: "menu management",
+	Short: "Menu management",
 	Long: `Let you manage menus.
 See https://cobbler.readthedocs.io/en/latest/cobbler.html#cobbler-menu for more information.`,
 	Run: func(cmd *cobra.Command, args []string) {
diff --git a/cmd/mgmtclass.go b/cmd/mgmtclass.go
index 61439d6..ee4f0f3 100644
--- a/cmd/mgmtclass.go
+++ b/cmd/mgmtclass.go
@@ -11,7 +11,7 @@ import (
 // mgmtclassCmd represents the mgmtclass command
 var mgmtclassCmd = &cobra.Command{
 	Use:   "mgmtclass",
-	Short: "mgmtclass management",
+	Short: "Mgmtclass management",
 	Long: `Let you manage mgmtclasses.
 See https://cobbler.readthedocs.io/en/latest/cobbler.html#cobbler-mgmtclass for more information.`,
 	Run: func(cmd *cobra.Command, args []string) {
diff --git a/cmd/mkloaders.go b/cmd/mkloaders.go
index c1d1070..c714597 100644
--- a/cmd/mkloaders.go
+++ b/cmd/mkloaders.go
@@ -11,7 +11,7 @@ import (
 // mkloadersCmd represents the mkloaders command
 var mkloadersCmd = &cobra.Command{
 	Use:   "mkloaders",
-	Short: "Generate GRUB bootloaders",
+	Short: "Generate GRUB 2 bootloaders",
 	Long: `Generate UEFI bootable GRUB 2 bootloaders. If available on the operating system Cobbler is running on,
 then this also generates bootloaders for different architectures then the one of the system.
 The options are configured in the Cobbler settings file.`,
diff --git a/cmd/package.go b/cmd/package.go
index a7168d9..993b370 100644
--- a/cmd/package.go
+++ b/cmd/package.go
@@ -11,7 +11,7 @@ import (
 // packageCmd represents the package command
 var packageCmd = &cobra.Command{
 	Use:   "package",
-	Short: "package management",
+	Short: "Package management",
 	Long: `Let you manage packages.
 See https://cobbler.readthedocs.io/en/latest/cobbler.html#cobbler-package for more information.`,
 	Run: func(cmd *cobra.Command, args []string) {
diff --git a/cmd/profile.go b/cmd/profile.go
index c97ee22..927b927 100644
--- a/cmd/profile.go
+++ b/cmd/profile.go
@@ -11,7 +11,7 @@ import (
 // profileCmd represents the profile command
 var profileCmd = &cobra.Command{
 	Use:   "profile",
-	Short: "profile management",
+	Short: "Profile management",
 	Long: `Let you manage profiles.
 See https://cobbler.readthedocs.io/en/latest/cobbler.html#cobbler-profile for more information.`,
 	Run: func(cmd *cobra.Command, args []string) {
diff --git a/cmd/report.go b/cmd/report.go
index 56c9875..c8ee607 100644
--- a/cmd/report.go
+++ b/cmd/report.go
@@ -11,7 +11,7 @@ import (
 // reportCmd represents the report command
 var reportCmd = &cobra.Command{
 	Use:   "report",
-	Short: "List configurations",
+	Short: "List configuration in detail",
 	Long: `Lists all configuration which Cobbler can obtain from the saved data. There are also report subcommands for
 most of the other Cobbler commands (currently: distro, profile, system, repo, image, mgmtclass, package, file, menu).
 Identical to 'cobbler list'`,
diff --git a/cmd/root.go b/cmd/root.go
index 637335a..228d7c4 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -26,7 +26,9 @@ var rootCmd = &cobra.Command{
 	Use:   "cobbler",
 	Short: "Cobbler CLI client",
 	Long:  "An independent CLI to manage a Cobbler server.",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Run: func(cmd *cobra.Command, args []string) {
+		cmd.Help()
+	},
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
diff --git a/cmd/setting.go b/cmd/setting.go
index 56016c6..686fb6b 100644
--- a/cmd/setting.go
+++ b/cmd/setting.go
@@ -11,7 +11,7 @@ import (
 // settingCmd represents the setting command
 var settingCmd = &cobra.Command{
 	Use:   "setting",
-	Short: "settings management",
+	Short: "Settings management",
 	Long:  `Let you manage settings.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		// TODO: call cobblerclient
diff --git a/cmd/signature.go b/cmd/signature.go
index 1978f93..cf2f7ed 100644
--- a/cmd/signature.go
+++ b/cmd/signature.go
@@ -11,7 +11,7 @@ import (
 // signatureCmd represents the signature command
 var signatureCmd = &cobra.Command{
 	Use:   "signature",
-	Short: "Signature handling",
+	Short: "Signature management",
 	Long:  `Reloads, reports or updates the signatures of the distinct operating system versions.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		// TODO: call cobblerclient
diff --git a/cmd/system.go b/cmd/system.go
index 6756c1b..2d72915 100644
--- a/cmd/system.go
+++ b/cmd/system.go
@@ -11,7 +11,7 @@ import (
 // systemCmd represents the system command
 var systemCmd = &cobra.Command{
 	Use:   "system",
-	Short: "system management",
+	Short: "System management",
 	Long: `Let you manage systems.
 See https://cobbler.readthedocs.io/en/latest/cobbler.html#cobbler-system for more information.`,
 	Run: func(cmd *cobra.Command, args []string) {
diff --git a/cmd/version.go b/cmd/version.go
index 911da28..583c895 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -11,7 +11,7 @@ import (
 // versionCmd represents the version command
 var versionCmd = &cobra.Command{
 	Use:   "version",
-	Short: "Show the Cobbler version",
+	Short: "Print the Cobbler version",
 	Long:  `Shows the Cobbler server version.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		// TODO: call cobblerclient