diff --git a/cmd/cmd.go b/cmd/cmd.go
index dae2c8dd..9e3fc0fc 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -11,12 +11,12 @@ import (
 
 var (
 	Version = "next"
-	Commit = ""
+	Commit  = ""
 )
 
 var Command = &cobra.Command{
-	Use:   "kubedb",
-	Short: "Interact with a database inside of Kubernetes",
+	Use:     "kubedb",
+	Short:   "Interact with a database inside of Kubernetes",
 	Version: buildVersion(),
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		cmd.SilenceUsage = true
diff --git a/cmd/dump/dump.go b/cmd/dump/dump.go
index fd730241..991ff033 100644
--- a/cmd/dump/dump.go
+++ b/cmd/dump/dump.go
@@ -29,10 +29,10 @@ var (
 	username  string
 	password  string
 	directory string
-	gzipFile bool
-	ifExists bool
-	clean bool
-	noOwner bool
+	gzipFile  bool
+	ifExists  bool
+	clean     bool
+	noOwner   bool
 )
 
 func init() {
diff --git a/cmd/exec/exec.go b/cmd/exec/exec.go
index 6261e583..a731e0ad 100644
--- a/cmd/exec/exec.go
+++ b/cmd/exec/exec.go
@@ -51,7 +51,7 @@ func run(cmd *cobra.Command, args []string) (err error) {
 	log.Println("Execing into \"" + postgresPod.Name + "\"")
 
 	stdin := streams.NewIn(os.Stdin)
-	if err := stdin.SetRawTerminal(); err != nil{
+	if err := stdin.SetRawTerminal(); err != nil {
 		return err
 	}
 	defer stdin.RestoreTerminal()
diff --git a/cmd/restore/restore.go b/cmd/restore/restore.go
index b5527eb9..fbe2df63 100644
--- a/cmd/restore/restore.go
+++ b/cmd/restore/restore.go
@@ -22,9 +22,9 @@ var Command = &cobra.Command{
 }
 
 var (
-	database  string
-	username  string
-	password  string
+	database          string
+	username          string
+	password          string
 	singleTransaction bool
 )
 
@@ -108,7 +108,7 @@ func buildCommand(gunzip bool) []string {
 	if gunzip {
 		cmd = []string{"gunzip", "|"}
 	}
-	cmd = append(cmd, "PGPASSWORD=" + password, "psql", "--username=" + username, database)
+	cmd = append(cmd, "PGPASSWORD="+password, "psql", "--username="+username, database)
 	if singleTransaction {
 		cmd = append(cmd, "--single-transaction")
 	}