diff --git a/Makefile b/Makefile
index 977cde2..15c02c9 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ default: fmt
 
 fmt:
 	go fmt ./...
+	goimports -l -w .
 
 docker-build:
 	docker build -t $(IMAGENAME) .
diff --git a/bot/bot.go b/bot/bot.go
index f507001..2051599 100644
--- a/bot/bot.go
+++ b/bot/bot.go
@@ -3,14 +3,15 @@ package bot
 //import "github.com/kr/pretty"
 import (
 	"fmt"
-	"github.com/mattermost/mattermost-server/v5/model"
-	"github.com/rs/zerolog/log"
 	"os"
 	"os/signal"
 	"regexp"
 	"strings"
 	"syscall"
 	"time"
+
+	"github.com/mattermost/mattermost-server/v5/model"
+	"github.com/rs/zerolog/log"
 )
 
 type Bot struct {
diff --git a/bot/logger.go b/bot/logger.go
index d7c4073..8ba7c93 100644
--- a/bot/logger.go
+++ b/bot/logger.go
@@ -1,11 +1,12 @@
 package bot
 
 import (
+	"os"
+	"time"
+
 	"github.com/mattn/go-isatty"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	"os"
-	"time"
 )
 
 func (b *Bot) setupLogging() {
diff --git a/bot/metar.go b/bot/metar.go
index bf09a31..a93b37d 100644
--- a/bot/metar.go
+++ b/bot/metar.go
@@ -2,13 +2,15 @@ package bot
 
 //import "github.com/kr/pretty"
 import (
+	"encoding/json"
 	"fmt"
-	"github.com/rs/zerolog/log"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"regexp"
 	"time"
+
+	"github.com/rs/zerolog/log"
 )
 
 type MetarResponse struct {
diff --git a/cmd/sco/main.go b/cmd/sco/main.go
index 3837b07..12e1dd4 100644
--- a/cmd/sco/main.go
+++ b/cmd/sco/main.go
@@ -1,7 +1,10 @@
 package main
 
-import "os"
-import "git.eeqj.de/sneak/sco/bot"
+import (
+	"os"
+
+	"git.eeqj.de/sneak/sco/bot"
+)
 
 var Version string
 var Commit string