diff --git a/commands.go b/commands.go
index dd7b7d0..fbbd5bd 100644
--- a/commands.go
+++ b/commands.go
@@ -17,10 +17,11 @@
 package main
 
 import (
-	"maunium.net/go/mautrix-whatsapp/types"
 	"strings"
-	"maunium.net/go/mautrix-appservice"
+
 	"maunium.net/go/maulogger"
+	"maunium.net/go/mautrix-appservice"
+	"maunium.net/go/mautrix-whatsapp/types"
 )
 
 type CommandHandler struct {
diff --git a/config/bridge.go b/config/bridge.go
index fc9da1b..11c55ba 100644
--- a/config/bridge.go
+++ b/config/bridge.go
@@ -18,11 +18,12 @@ package config
 
 import (
 	"bytes"
-	"text/template"
-	"maunium.net/go/mautrix-appservice"
-	"strings"
 	"strconv"
+	"strings"
+	"text/template"
+
 	"github.com/Rhymen/go-whatsapp"
+	"maunium.net/go/mautrix-appservice"
 	"maunium.net/go/mautrix-whatsapp/types"
 )
 
@@ -86,10 +87,10 @@ func (bc BridgeConfig) FormatUsername(receiver types.MatrixUserID, userID types.
 
 func (bc BridgeConfig) MarshalYAML() (interface{}, error) {
 	bc.DisplaynameTemplate = bc.FormatDisplayname(whatsapp.Contact{
-		Jid: "{{.Jid}}",
+		Jid:    "{{.Jid}}",
 		Notify: "{{.Notify}}",
-		Name: "{{.Name}}",
-		Short: "{{.Short}}",
+		Name:   "{{.Name}}",
+		Short:  "{{.Short}}",
 	})
 	bc.UsernameTemplate = bc.FormatUsername("{{.Receiver}}", "{{.UserID}}")
 	return bc, nil
diff --git a/config/config.go b/config/config.go
index 5817e25..53680c9 100644
--- a/config/config.go
+++ b/config/config.go
@@ -17,9 +17,10 @@
 package config
 
 import (
-	"maunium.net/go/mautrix-appservice"
 	"io/ioutil"
+
 	"gopkg.in/yaml.v2"
+	"maunium.net/go/mautrix-appservice"
 )
 
 type Config struct {
diff --git a/config/registration.go b/config/registration.go
index 2f68ee0..e1e08b5 100644
--- a/config/registration.go
+++ b/config/registration.go
@@ -17,9 +17,10 @@
 package config
 
 import (
-	"maunium.net/go/mautrix-appservice"
-	"regexp"
 	"fmt"
+	"regexp"
+
+	"maunium.net/go/mautrix-appservice"
 )
 
 func (config *Config) NewRegistration() (*appservice.Registration, error) {
diff --git a/database/database.go b/database/database.go
index f70de78..b839aeb 100644
--- a/database/database.go
+++ b/database/database.go
@@ -18,6 +18,7 @@ package database
 
 import (
 	"database/sql"
+
 	_ "github.com/mattn/go-sqlite3"
 	log "maunium.net/go/maulogger"
 )
diff --git a/database/message.go b/database/message.go
index a9e25aa..47d17f9 100644
--- a/database/message.go
+++ b/database/message.go
@@ -17,9 +17,10 @@
 package database
 
 import (
+	"database/sql"
+
 	log "maunium.net/go/maulogger"
 	"maunium.net/go/mautrix-whatsapp/types"
-	"database/sql"
 )
 
 type MessageQuery struct {
diff --git a/database/portal.go b/database/portal.go
index 4bf2d22..6a2ed54 100644
--- a/database/portal.go
+++ b/database/portal.go
@@ -17,9 +17,10 @@
 package database
 
 import (
+	"database/sql"
+
 	log "maunium.net/go/maulogger"
 	"maunium.net/go/mautrix-whatsapp/types"
-	"database/sql"
 )
 
 type PortalQuery struct {
diff --git a/database/puppet.go b/database/puppet.go
index beccf2d..434fbe0 100644
--- a/database/puppet.go
+++ b/database/puppet.go
@@ -17,9 +17,10 @@
 package database
 
 import (
+	"database/sql"
+
 	log "maunium.net/go/maulogger"
 	"maunium.net/go/mautrix-whatsapp/types"
-	"database/sql"
 )
 
 type PuppetQuery struct {
diff --git a/database/user.go b/database/user.go
index 2ca79d9..15dc793 100644
--- a/database/user.go
+++ b/database/user.go
@@ -17,10 +17,11 @@
 package database
 
 import (
-	log "maunium.net/go/maulogger"
-	"github.com/Rhymen/go-whatsapp"
-	"maunium.net/go/mautrix-whatsapp/types"
 	"database/sql"
+
+	"github.com/Rhymen/go-whatsapp"
+	log "maunium.net/go/maulogger"
+	"maunium.net/go/mautrix-whatsapp/types"
 )
 
 type UserQuery struct {
@@ -46,8 +47,8 @@ func (uq *UserQuery) CreateTable() error {
 
 func (uq *UserQuery) New() *User {
 	return &User{
-		db:     uq.db,
-		log:    uq.log,
+		db:  uq.db,
+		log: uq.log,
 	}
 }
 
diff --git a/main.go b/main.go
index 1381b9b..c5a05ac 100644
--- a/main.go
+++ b/main.go
@@ -19,12 +19,13 @@ package main
 import (
 	"fmt"
 	"os"
-	"maunium.net/go/mautrix-whatsapp/config"
-	flag "maunium.net/go/mauflag"
 	"os/signal"
 	"syscall"
-	"maunium.net/go/mautrix-appservice"
+
+	flag "maunium.net/go/mauflag"
 	log "maunium.net/go/maulogger"
+	"maunium.net/go/mautrix-appservice"
+	"maunium.net/go/mautrix-whatsapp/config"
 	"maunium.net/go/mautrix-whatsapp/database"
 	"maunium.net/go/mautrix-whatsapp/types"
 )
diff --git a/statestore.go b/statestore.go
index af6b5f7..e60bf0d 100644
--- a/statestore.go
+++ b/statestore.go
@@ -17,11 +17,12 @@
 package main
 
 import (
-	"maunium.net/go/gomatrix"
-	"maunium.net/go/mautrix-appservice"
 	"encoding/json"
 	"io/ioutil"
 	"os"
+
+	"maunium.net/go/gomatrix"
+	"maunium.net/go/mautrix-appservice"
 )
 
 type AutosavingStateStore struct {
@@ -70,4 +71,4 @@ func (store *AutosavingStateStore) SetMembership(roomID, userID, membership stri
 func (store *AutosavingStateStore) SetPowerLevels(roomID string, levels *gomatrix.PowerLevels) {
 	store.BasicStateStore.SetPowerLevels(roomID, levels)
 	store.Save()
-}
\ No newline at end of file
+}
diff --git a/types/types.go b/types/types.go
index 9b40597..20ec56e 100644
--- a/types/types.go
+++ b/types/types.go
@@ -29,4 +29,4 @@ type MatrixUserID = string
 type MatrixRoomID = string
 
 // MatrixEventID is the internal ID of a Matrix event.
-type MatrixEventID = string
\ No newline at end of file
+type MatrixEventID = string
diff --git a/whatsapp-ext/props.go b/whatsapp-ext/props.go
index 993ee9b..4573606 100644
--- a/whatsapp-ext/props.go
+++ b/whatsapp-ext/props.go
@@ -17,8 +17,9 @@
 package whatsappExt
 
 import (
-	"github.com/Rhymen/go-whatsapp"
 	"encoding/json"
+
+	"github.com/Rhymen/go-whatsapp"
 )
 
 type ProtocolProps struct {
diff --git a/whatsapp-ext/stream.go b/whatsapp-ext/stream.go
index 60f34de..dcced66 100644
--- a/whatsapp-ext/stream.go
+++ b/whatsapp-ext/stream.go
@@ -18,6 +18,7 @@ package whatsappExt
 
 import (
 	"encoding/json"
+
 	"github.com/Rhymen/go-whatsapp"
 )