diff --git a/Makefile b/Makefile
index 80efbe4f..5d3b4ff4 100644
--- a/Makefile
+++ b/Makefile
@@ -45,10 +45,10 @@ clean:
 	@rm '$(GOPATH)/bin/kadabra'
 
 format:
-	@gofmt -s -w .
+	@gofmt -s -w $$(find . -type f -name '*.go' | grep -v "/vendor/")
 
 check:
-	@test -z $$(gofmt -l .) || \
+	@test -z $$(gofmt -l $$(find . -type f -name '*.go' | grep -v "/vendor/")) || \
 	(echo "gofmt: formatting issue - run 'make format' to resolve" && exit 1)
 
 test:
diff --git a/cli/app/app.go b/cli/app/app.go
index 60745f5a..8edd8a7e 100644
--- a/cli/app/app.go
+++ b/cli/app/app.go
@@ -5,10 +5,10 @@ import (
 )
 
 var AppCommand = cli.Command{
-	Name:            "app",
-	Aliases:         []string{"a"},
-	Usage:           "Manage apps",
-	UsageText:       "abra app [command] [options] [arguments]",
+	Name:      "app",
+	Aliases:   []string{"a"},
+	Usage:     "Manage apps",
+	UsageText: "abra app [command] [arguments] [options]",
 	Commands: []*cli.Command{
 		&appBackupCommand,
 		&appCheckCommand,