diff --git a/command/swarm/init.go b/command/swarm/init.go
index 60fb8e8fe3..16f372f8d7 100644
--- a/command/swarm/init.go
+++ b/command/swarm/init.go
@@ -14,13 +14,6 @@ import (
 	"github.com/spf13/pflag"
 )
 
-const (
-	generatedSecretEntropyBytes = 16
-	generatedSecretBase         = 36
-	// floor(log(2^128-1, 36)) + 1
-	maxGeneratedSecretLength = 25
-)
-
 type initOptions struct {
 	swarmOptions
 	listenAddr NodeAddrOption
@@ -46,7 +39,7 @@ func newInitCommand(dockerCli *command.DockerCli) *cobra.Command {
 	flags := cmd.Flags()
 	flags.Var(&opts.listenAddr, flagListenAddr, "Listen address (format: <ip|interface>[:port])")
 	flags.StringVar(&opts.advertiseAddr, flagAdvertiseAddr, "", "Advertised address (format: <ip|interface>[:port])")
-	flags.BoolVar(&opts.forceNewCluster, "force-new-cluster", false, "Force create a new cluster from current state.")
+	flags.BoolVar(&opts.forceNewCluster, "force-new-cluster", false, "Force create a new cluster from current state")
 	addSwarmFlags(flags, &opts.swarmOptions)
 	return cmd
 }
diff --git a/command/swarm/opts.go b/command/swarm/opts.go
index 58330b7f8a..3659b55f81 100644
--- a/command/swarm/opts.go
+++ b/command/swarm/opts.go
@@ -33,7 +33,7 @@ type swarmOptions struct {
 	externalCA          ExternalCAOption
 }
 
-// NodeAddrOption is a pflag.Value for listen and remote addresses
+// NodeAddrOption is a pflag.Value for listening addresses
 type NodeAddrOption struct {
 	addr string
 }