diff --git a/command.go b/command.go
index 8fa6ce2..6041835 100644
--- a/command.go
+++ b/command.go
@@ -27,7 +27,7 @@ func (c Command) Run(ctx *Context) error {
 	// append help to flags
 	c.Flags = append(
 		c.Flags,
-		BoolFlag{"help, h","show help"},
+		BoolFlag{"help, h", "show help"},
 	)
 
 	set := flagSet(c.Name, c.Flags)
diff --git a/context.go b/context.go
index b9fe259..335184b 100644
--- a/context.go
+++ b/context.go
@@ -1,8 +1,8 @@
 package cli
 
 import (
-	"flag"
 	"errors"
+	"flag"
 	"strconv"
 	"strings"
 )
diff --git a/flag.go b/flag.go
index a5f396d..7835b3b 100644
--- a/flag.go
+++ b/flag.go
@@ -184,7 +184,7 @@ func prefixedNames(fullName string) (prefixed string) {
 	for i, name := range parts {
 		name = strings.Trim(name, " ")
 		prefixed += prefixFor(name) + name
-		if i < len(parts) - 1 {
+		if i < len(parts)-1 {
 			prefixed += ", "
 		}
 	}
diff --git a/flag_test.go b/flag_test.go
index adceef0..aa8fdc6 100644
--- a/flag_test.go
+++ b/flag_test.go
@@ -93,7 +93,7 @@ func TestParseMultiString(t *testing.T) {
 			}
 		},
 	}).Run([]string{"run", "--serve", "10"})
-*/
+	*/
 }
 
 func TestParseMultiInt(t *testing.T) {