5 files changed, 11 insertions, 6 deletions
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go
index ff21166f3..85b96d37b 100644
--- a/cmd/podman/pods/create.go
+++ b/cmd/podman/pods/create.go
@@ -9,6 +9,7 @@ import (
 	"github.com/containers/libpod/cmd/podman/common"
 	"github.com/containers/libpod/cmd/podman/parse"
 	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/cmd/podman/validate"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/errorhandling"
 	"github.com/containers/libpod/pkg/specgen"
@@ -24,7 +25,7 @@ var (
 
 	createCommand = &cobra.Command{
 		Use:   "create",
-		Args:  cobra.NoArgs,
+		Args:  validate.NoArgs,
 		Short: "Create a new empty pod",
 		Long:  podCreateDescription,
 		RunE:  create,
@@ -116,7 +117,7 @@ func create(cmd *cobra.Command, args []string) error {
 	case "slip4netns":
 		n.NSMode = specgen.Slirp
 	default:
-		if strings.HasPrefix(netInput, "container:") { //nolint
+		if strings.HasPrefix(netInput, "container:") { // nolint
 			split := strings.Split(netInput, ":")
 			if len(split) != 2 {
 				return errors.Errorf("invalid network paramater: %q", netInput)
diff --git a/cmd/podman/pods/exists.go b/cmd/podman/pods/exists.go
index 5a94bf150..cf3e3eae5 100644
--- a/cmd/podman/pods/exists.go
+++ b/cmd/podman/pods/exists.go
@@ -19,6 +19,7 @@ var (
 		Args:  cobra.ExactArgs(1),
 		Example: `podman pod exists podID
   podman pod exists mypod || podman pod create --name mypod`,
+		DisableFlagsInUseLine: true,
 	}
 )
 
diff --git a/cmd/podman/pods/pod.go b/cmd/podman/pods/pod.go
index e86b8aba4..edca08202 100644
--- a/cmd/podman/pods/pod.go
+++ b/cmd/podman/pods/pod.go
@@ -2,6 +2,7 @@ package pods
 
 import (
 	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/cmd/podman/validate"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/util"
 	"github.com/spf13/cobra"
@@ -17,7 +18,7 @@ var (
 		Short:            "Manage pods",
 		Long:             "Manage pods",
 		TraverseChildren: true,
-		RunE:             registry.SubCommandExists,
+		RunE:             validate.SubCommandExists,
 	}
 	containerConfig = util.DefaultContainerConfig()
 )
diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go
index 6d0d9cf7f..b97dfeb66 100644
--- a/cmd/podman/pods/ps.go
+++ b/cmd/podman/pods/ps.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/cmd/podman/validate"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
@@ -28,11 +29,12 @@ var (
 		Short:   "list pods",
 		Long:    psDescription,
 		RunE:    pods,
+		Args:    validate.NoArgs,
 	}
 )
 
 var (
-	defaultHeaders string = "POD ID\tNAME\tSTATUS\tCREATED"
+	defaultHeaders = "POD ID\tNAME\tSTATUS\tCREATED"
 	inputFilters   []string
 	noTrunc        bool
 	psInput        entities.PodPSOptions
diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go
index ea3a6476a..4b9882f8a 100644
--- a/cmd/podman/pods/rm.go
+++ b/cmd/podman/pods/rm.go
@@ -41,10 +41,10 @@ func init() {
 	})
 
 	flags := rmCommand.Flags()
-	flags.BoolVarP(&rmOptions.All, "all", "a", false, "Restart all running pods")
+	flags.BoolVarP(&rmOptions.All, "all", "a", false, "Remove all running pods")
 	flags.BoolVarP(&rmOptions.Force, "force", "f", false, "Force removal of a running pod by first stopping all containers, then removing all containers in the pod.  The default is false")
 	flags.BoolVarP(&rmOptions.Ignore, "ignore", "i", false, "Ignore errors when a specified pod is missing")
-	flags.BoolVarP(&rmOptions.Latest, "latest", "l", false, "Restart the latest pod podman is aware of")
+	flags.BoolVarP(&rmOptions.Latest, "latest", "l", false, "Remove the latest pod podman is aware of")
 	if registry.IsRemote() {
 		_ = flags.MarkHidden("latest")
 		_ = flags.MarkHidden("ignore")