diff --git a/do.sh b/do.sh
index dc57e98..9e7aabe 100644
--- a/do.sh
+++ b/do.sh
@@ -5,21 +5,28 @@
 set -Eeuo pipefail # -e "Automatic exit from bash shell script on error"  -u "Treat unset variables and parameters as errors"
 
 build() {
-   echo "I am ${FUNCNAME[0]}ing"
-   go version
-   go build
+  echo "I am ${FUNCNAME[0]}ing"
+  go version
+  go build
 }
 
 test() {
-   _lint && _vet && _test
+  echo "I am ${FUNCNAME[0]}ing"
+  _lint && _vet && _test
 }
 
 run() {
-  test && go run main.go
+  echo "I am ${FUNCNAME[0]}ing"
+  fmt && test && go run main.go
+}
+
+fmt() {
+  echo "I am ${FUNCNAME[0]}ing"
+  go fmt ./...
 }
 
 _test() {
-   go test -v -coverprofile=coverage.out -covermode count ./... | tee tests.out
+  go test -v -coverprofile=coverage.out -covermode count ./... | tee tests.out
 }
 
 _testhtml() {
@@ -27,15 +34,15 @@ _testhtml() {
 }
 
 _lint() {
-   golint -set_exit_status ./...
+  golint -set_exit_status ./...
 }
 
 _vet() {
-   go vet ./...
+  go vet ./...
 }
 
 all() {
-   test && build
+  fmt && test && build
 }
 
 "$@" # <- execute the task