diff --git a/cmd/server/main.go b/cmd/server/main.go
index d47bbd8..c3accb8 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -5,7 +5,7 @@ import (
 	"github.com/GRFreire/nthmail/pkg/mail_server"
 	"github.com/GRFreire/nthmail/pkg/web_server"
 	"log"
-    "sync"
+	"sync"
 
 	_ "github.com/mattn/go-sqlite3"
 )
@@ -17,18 +17,18 @@ func main() {
 	}
 	defer db.Close()
 
-    var wg sync.WaitGroup
-    wg.Add(1)
-    go func(db *sql.DB) {
-        defer wg.Done()
-        mail_server.Start(db)
-    }(db)
+	var wg sync.WaitGroup
+	wg.Add(1)
+	go func(db *sql.DB) {
+		defer wg.Done()
+		mail_server.Start(db)
+	}(db)
 
-    wg.Add(1)
-    go func(db *sql.DB) {
-        defer wg.Done()
-        web_server.Start(db)
-    }(db)
+	wg.Add(1)
+	go func(db *sql.DB) {
+		defer wg.Done()
+		web_server.Start(db)
+	}(db)
 
-    wg.Wait()
+	wg.Wait()
 }
diff --git a/format.sh b/format.sh
new file mode 100755
index 0000000..767b5a6
--- /dev/null
+++ b/format.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+for file in $(find . -path .git -prune -o -name '*.go' -print); do go fmt $file; done
diff --git a/pkg/mail_server/main.go b/pkg/mail_server/main.go
index a0af9bf..f9ee6bf 100644
--- a/pkg/mail_server/main.go
+++ b/pkg/mail_server/main.go
@@ -53,7 +53,7 @@ func (session *Session) Rcpt(to string, opts *smtp.RcptOptions) error {
 }
 
 func (session *Session) Data(reader io.Reader) error {
-    defer session.tx.Rollback()
+	defer session.tx.Rollback()
 	if bytes, err := io.ReadAll(reader); err != nil {
 		return err
 	} else {
@@ -100,7 +100,7 @@ func Start(db *sql.DB) error {
 	}
 
 	var port int
-    var err error
+	var err error
 	port_str, exists := os.LookupEnv("MAIL_SERVER_PORT")
 	if exists {
 		port, err = strconv.Atoi(port_str)
@@ -124,5 +124,5 @@ func Start(db *sql.DB) error {
 		return err
 	}
 
-    return nil
+	return nil
 }
diff --git a/pkg/rig/rig.go b/pkg/rig/rig.go
index c0a0447..2e87aa7 100644
--- a/pkg/rig/rig.go
+++ b/pkg/rig/rig.go
@@ -6,9 +6,9 @@ import (
 )
 
 func GenerateRandomInboxName() string {
-    animal := animals[rand.Intn(len(animals))]
-    color := colors[rand.Intn(len(colors))]
-    adjective := adjectives[rand.Intn(len(adjectives))]
+	animal := animals[rand.Intn(len(animals))]
+	color := colors[rand.Intn(len(colors))]
+	adjective := adjectives[rand.Intn(len(adjectives))]
 
-    return fmt.Sprintf("%s-%s-%s", adjective, color, animal)
+	return fmt.Sprintf("%s-%s-%s", adjective, color, animal)
 }