diff --git a/command.go b/command.go
index 3d44404..5bb2ada 100644
--- a/command.go
+++ b/command.go
@@ -266,7 +266,7 @@ func reorderArgs(args []string) []string {
 }
 
 func translateShortOptions(set *flag.FlagSet, flagArgs Args) []string {
-	allCharsFlags := func (s string) bool {
+	allCharsFlags := func(s string) bool {
 		for i := range s {
 			f := set.Lookup(string(s[i]))
 			if f == nil {
diff --git a/command_test.go b/command_test.go
index 8c2650e..6ef9202 100644
--- a/command_test.go
+++ b/command_test.go
@@ -59,9 +59,9 @@ func TestCommandFlagParsing(t *testing.T) {
 
 func TestParseAndRunShortOpts(t *testing.T) {
 	cases := []struct {
-		testArgs               []string
-		expectedErr            error
-		expectedArgs           []string
+		testArgs     []string
+		expectedErr  error
+		expectedArgs []string
 	}{
 		{[]string{"foo", "test", "-a"}, nil, []string{}},
 		{[]string{"foo", "test", "-c", "arg1", "arg2"}, nil, []string{"arg1", "arg2"}},
@@ -71,18 +71,18 @@ func TestParseAndRunShortOpts(t *testing.T) {
 		{[]string{"foo", "test", "-cf"}, nil, []string{}},
 		{[]string{"foo", "test", "-acf"}, nil, []string{}},
 		{[]string{"foo", "test", "-invalid"}, errors.New("flag provided but not defined: -invalid"), []string{}},
-		{[]string{"foo", "test", "-acf", "arg1", "-invalid"}, nil, []string{"arg1" ,"-invalid"}},
+		{[]string{"foo", "test", "-acf", "arg1", "-invalid"}, nil, []string{"arg1", "-invalid"}},
 	}
 
 	var args []string
 	cmd := Command{
-		Name:                   "test",
-		Usage:                  "this is for testing",
-		Description:            "testing",
-		Action:                 func(c *Context) error {
-						args = c.Args()
-						return nil
-					},
+		Name:        "test",
+		Usage:       "this is for testing",
+		Description: "testing",
+		Action: func(c *Context) error {
+			args = c.Args()
+			return nil
+		},
 		SkipArgReorder:         true,
 		UseShortOptionHandling: true,
 		Flags: []Flag{
diff --git a/flag_test.go b/flag_test.go
index da9fd73..ac3e70c 100644
--- a/flag_test.go
+++ b/flag_test.go
@@ -1052,7 +1052,7 @@ func TestParseBoolShortOptionHandle(t *testing.T) {
 	a := App{
 		Commands: []Command{
 			{
-				Name: "foobar",
+				Name:                   "foobar",
 				UseShortOptionHandling: true,
 				Action: func(ctx *Context) error {
 					if ctx.Bool("serve") != true {