diff --git a/Makefile b/Makefile
index e17318d..6bb39be 100644
--- a/Makefile
+++ b/Makefile
@@ -48,8 +48,10 @@ test:
 	@go test ./... | grep -v '^?' || true
 
 fmt:
-	@go fmt ./...
-	@$(GOPATH)/bin/goimports -w .
+	@go fmt ./internal/./...
+	@go fmt ./cmd/./...
+	@$(GOPATH)/bin/goimports -w ./internal/
+	@$(GOPATH)/bin/goimports -w ./cmd/
 
 vet:
 	@go vet ./...