diff --git a/api/auth.go b/api/auth.go
index fb2dec6..5597ded 100644
--- a/api/auth.go
+++ b/api/auth.go
@@ -2,12 +2,13 @@ package api
 
 import (
 	"encoding/json"
+	"net/http"
+	"os"
+
 	"github.com/dannyvankooten/ana/db"
 	"github.com/dannyvankooten/ana/models"
 	"github.com/gorilla/sessions"
 	"golang.org/x/crypto/bcrypt"
-	"net/http"
-	"os"
 )
 
 type Login struct {
diff --git a/api/collect.go b/api/collect.go
index c62a0a7..a31f385 100644
--- a/api/collect.go
+++ b/api/collect.go
@@ -2,11 +2,12 @@ package api
 
 import (
 	"encoding/base64"
+	"net/http"
+	"strings"
+
 	"github.com/dannyvankooten/ana/db"
 	"github.com/dannyvankooten/ana/models"
 	"github.com/mssola/user_agent"
-	"net/http"
-	"strings"
 )
 
 func getRequestIp(r *http.Request) string {
diff --git a/api/countries.go b/api/countries.go
index 52f6da6..73337cf 100644
--- a/api/countries.go
+++ b/api/countries.go
@@ -2,8 +2,9 @@ package api
 
 import (
 	"encoding/json"
-	"github.com/dannyvankooten/ana/count"
 	"net/http"
+
+	"github.com/dannyvankooten/ana/count"
 )
 
 // URL: /api/countries
diff --git a/api/pageviews.go b/api/pageviews.go
index 2770f95..e95bb29 100644
--- a/api/pageviews.go
+++ b/api/pageviews.go
@@ -2,10 +2,11 @@ package api
 
 import (
 	"encoding/json"
+	"net/http"
+
 	"github.com/dannyvankooten/ana/count"
 	"github.com/dannyvankooten/ana/db"
 	"github.com/dannyvankooten/ana/models"
-	"net/http"
 )
 
 // URL: /api/pageviews
diff --git a/api/visitors.go b/api/visitors.go
index be8a479..f6b814b 100644
--- a/api/visitors.go
+++ b/api/visitors.go
@@ -2,9 +2,10 @@ package api
 
 import (
 	"encoding/json"
+	"net/http"
+
 	"github.com/dannyvankooten/ana/count"
 	"github.com/dannyvankooten/ana/db"
-	"net/http"
 )
 
 // URL: /api/visitors/count
diff --git a/commands/server.go b/commands/server.go
index b2d5cdc..52fe2e8 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -1,12 +1,13 @@
 package commands
 
 import (
-	"github.com/dannyvankooten/ana/api"
-	"github.com/gorilla/handlers"
-	"github.com/gorilla/mux"
 	"log"
 	"net/http"
 	"os"
+
+	"github.com/dannyvankooten/ana/api"
+	"github.com/gorilla/handlers"
+	"github.com/gorilla/mux"
 )
 
 func startServer() {
diff --git a/commands/users.go b/commands/users.go
index 0aee846..1c57c3d 100644
--- a/commands/users.go
+++ b/commands/users.go
@@ -1,10 +1,11 @@
 package commands
 
 import (
+	"log"
+
 	"github.com/dannyvankooten/ana/db"
 	"github.com/dannyvankooten/ana/models"
 	"golang.org/x/crypto/bcrypt"
-	"log"
 )
 
 func createUser() {
diff --git a/db/seed.go b/db/seed.go
index 3e2dc50..1fbb31f 100644
--- a/db/seed.go
+++ b/db/seed.go
@@ -2,10 +2,10 @@ package db
 
 import (
 	"fmt"
-	"github.com/Pallinder/go-randomdata"
-	"github.com/dannyvankooten/ana/models"
 	"math/rand"
 	"time"
+
+	"github.com/dannyvankooten/ana/models"
 )
 
 var browserNames = []string{