diff --git a/Makefile b/Makefile
index 5eef6db..afd429a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,15 +20,16 @@ all: format build
 # Alias for building program binary
 build: $(BINARIES)
 
-tidy:
+mod-tidy:
 	# Needed to fetch new dependencies and add them to go.mod
 	go mod tidy
 
 clean:
 	rm -f $(BINARIES)
 
-format: tidy
+format: mod-tidy
 	go fmt ./...
+	gofmt -s -w $(GO_FILES)
 
 golines:
 	golines -w --ignore-generated --chain-split-dots --max-len=80 --reformat-tags .