@@ -51,7 +51,7 @@ func NewCommandManageNode(f *clientcmd.Factory, commandName, fullName string, ou

 	cmd := &cobra.Command{

 		Use:     commandName,

-		Short:   "Manage node operations: schedulable, evacuate, list-pods",

+		Short:   "Manage nodes - list pods, evacuate, or mark ready",

 		Long:    manageNodeLong,

 		Example: fmt.Sprintf(manageNodeExample, fullName),

 		Run: func(c *cobra.Command, args []string) {

@@ -30,8 +30,8 @@ func NewCmdWhoCan(name, fullName string, f *clientcmd.Factory, out io.Writer) *c

 	cmd := &cobra.Command{

 		Use:   "who-can VERB RESOURCE",

-		Short: "Indicates which users can perform the action on the resource.",

-		Long:  `Indicates which users can perform the action on the resource.`,

+		Short: "List who can perform the specified action on a resource",

+		Long:  "List who can perform the specified action on a resource",

 		Run: func(cmd *cobra.Command, args []string) {

 			if err := options.complete(args); err != nil {

 				kcmdutil.CheckErr(kcmdutil.UsageError(cmd, err.Error()))

@@ -43,7 +43,7 @@ func NewCmdPruneBuilds(f *clientcmd.Factory, parentName, name string, out io.Wri

 	cmd := &cobra.Command{

 		Use:   name,

-		Short: "Remove older completed and failed builds",

+		Short: "Remove completed and failed builds",

 		Long:  fmt.Sprintf(buildsLongDesc, parentName, name),

 		Run: func(cmd *cobra.Command, args []string) {

@@ -42,7 +42,7 @@ func NewCmdPruneDeployments(f *clientcmd.Factory, parentName, name string, out i

 	cmd := &cobra.Command{

 		Use:   name,

-		Short: "Remove older completed and failed deployments",

+		Short: "Remove completed and failed deployments",

 		Long:  fmt.Sprintf(deploymentsLongDesc, parentName, name),

 		Run: func(cmd *cobra.Command, args []string) {

@@ -47,7 +47,7 @@ func NewCmdPruneImages(f *clientcmd.Factory, parentName, name string, out io.Wri

 	cmd := &cobra.Command{

 		Use:   name,

-		Short: "Prune images",

+		Short: "Remove unreferenced images",

 		Long:  fmt.Sprintf(imagesLongDesc, parentName, name),

 		Run: func(cmd *cobra.Command, args []string) {

@@ -67,12 +67,12 @@ func NewCommandCLI(name, fullName string) *cobra.Command {

 		{

 			Message: "Basic Commands:",

 			Commands: []*cobra.Command{

+				cmd.NewCmdTypes(fullName, f, out),

 				loginCmd,

 				cmd.NewCmdRequestProject("new-project", fullName+" new-project", fullName+" login", fullName+" project", f, out),

 				cmd.NewCmdNewApplication(fullName, f, out),

 				cmd.NewCmdStatus(fullName, f, out),

 				cmd.NewCmdProject(fullName+" project", f, out),

-				cmd.NewCmdTypes(fullName, f, out),

 			},

 		},

 		{

@@ -31,7 +31,7 @@ const (

 func NewCmdCancelBuild(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {

 	cmd := &cobra.Command{

 		Use:     "cancel-build BUILD",

-		Short:   "Cancel a pending or running build.",

+		Short:   "Cancel a pending or running build",

 		Long:    cancelBuildLong,

 		Example: fmt.Sprintf(cancelBuildExample, fullName),

 		Run: func(cmd *cobra.Command, args []string) {

@@ -65,7 +65,7 @@ func NewCmdDeploy(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.C

 	cmd := &cobra.Command{

 		Use:     "deploy DEPLOYMENTCONFIG",

-		Short:   "View, start and restart deployments.",

+		Short:   "View, start and restart deployments",

 		Long:    deployLong,

 		Example: fmt.Sprintf(deployExample, fullName),

 		Run: func(cmd *cobra.Command, args []string) {

@@ -60,7 +60,7 @@ func NewCmdEdit(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Com

 	var filenames util.StringList

 	cmd := &cobra.Command{

 		Use:     "edit (RESOURCE/NAME | -f FILENAME)",

-		Short:   "Edit a resource on the server and apply the update.",

+		Short:   "Edit a resource on the server",

 		Long:    editLong,

 		Example: fmt.Sprintf(editExample, fullName),

 		Run: func(cmd *cobra.Command, args []string) {

@@ -30,7 +30,7 @@ have tag and image information imported.`

 func NewCmdImportImage(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {

 	cmd := &cobra.Command{

 		Use:     "import-image IMAGESTREAM",

-		Short:   "Imports tag and image information from an external Docker image repository.",

+		Short:   "Imports images from a Docker registry",

 		Long:    importImageLong,

 		Example: fmt.Sprintf(importImageExample, fullName),

 		Run: func(cmd *cobra.Command, args []string) {

@@ -50,7 +50,7 @@ func NewCmdRollback(fullName string, f *clientcmd.Factory, out io.Writer) *cobra

 	cmd := &cobra.Command{

 		Use:     "rollback DEPLOYMENT",

-		Short:   "Revert part of an application back to a previous deployment.",

+		Short:   "Revert part of an application back to a previous deployment",

 		Long:    rollbackLong,

 		Example: fmt.Sprintf(rollbackExample, fullName),

 		Run: func(cmd *cobra.Command, args []string) {

@@ -49,7 +49,7 @@ func NewCmdStartBuild(fullName string, f *clientcmd.Factory, out io.Writer) *cob

 	cmd := &cobra.Command{

 		Use:     "start-build (BUILDCONFIG | --from-build=BUILD)",

-		Short:   "Starts a new build from existing Build or BuildConfig",

+		Short:   "Starts a new build",

 		Long:    startBuildLong,

 		Example: fmt.Sprintf(startBuildExample, fullName),

 		Run: func(cmd *cobra.Command, args []string) {

@@ -89,7 +89,7 @@ func NewEdge(fullname, to string) *Edge {

 func NewCmdBuildChain(f *clientcmd.Factory, parentName, name string) *cobra.Command {

 	cmd := &cobra.Command{

 		Use:     fmt.Sprintf("%s [IMAGESTREAM:TAG | --all]", name),

-		Short:   "Output build dependencies of a specific ImageStream",

+		Short:   "Output build dependencies of a specific image stream",

 		Long:    buildChainLong,

 		Example: buildChainExample,

 		Run: func(cmd *cobra.Command, args []string) {

@@ -98,8 +98,8 @@ func NewCmdBuildChain(f *clientcmd.Factory, parentName, name string) *cobra.Comm

 		},

 	}

-	cmd.Flags().Bool("all", false, "Build dependency trees for all ImageStreams")

-	cmd.Flags().Bool("all-tags", false, "Build dependency trees for all tags of a specific ImageStream")

+	cmd.Flags().Bool("all", false, "Build dependency trees for all image streams")

+	cmd.Flags().Bool("all-tags", false, "Build dependency trees for all tags of a specific image stream")

 	cmd.Flags().StringP("output", "o", "json", "Output format of dependency tree(s)")

 	return cmd

 }