diff --git a/api/message.go b/api/message.go
index 234e88b..358f236 100644
--- a/api/message.go
+++ b/api/message.go
@@ -2,11 +2,12 @@ package api
 
 import (
 	"errors"
+	"strconv"
+	"time"
+
 	"github.com/gin-gonic/gin"
 	"github.com/jmattheis/memo/auth"
 	"github.com/jmattheis/memo/model"
-	"strconv"
-	"time"
 )
 
 // The MessageDatabase interface for encapsulating database access.
diff --git a/api/message_test.go b/api/message_test.go
index c06565d..63b7e8b 100644
--- a/api/message_test.go
+++ b/api/message_test.go
@@ -1,6 +1,12 @@
 package api
 
 import (
+	"io/ioutil"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
 	"github.com/bouk/monkey"
 	"github.com/gin-gonic/gin"
 	apimock "github.com/jmattheis/memo/api/mock"
@@ -9,11 +15,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
-	"io/ioutil"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"time"
 )
 
 func TestMessageSuite(t *testing.T) {
diff --git a/api/token.go b/api/token.go
index 1f22df3..fe9415a 100644
--- a/api/token.go
+++ b/api/token.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"fmt"
+
 	"github.com/gin-gonic/gin"
 	"github.com/jmattheis/memo/auth"
 	"github.com/jmattheis/memo/model"
diff --git a/api/token_test.go b/api/token_test.go
index 456a073..f4eb991 100644
--- a/api/token_test.go
+++ b/api/token_test.go
@@ -2,17 +2,18 @@ package api
 
 import (
 	"errors"
+	"io/ioutil"
+	"math/rand"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
 	"github.com/gin-gonic/gin"
 	apimock "github.com/jmattheis/memo/api/mock"
 	"github.com/jmattheis/memo/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
-	"io/ioutil"
-	"math/rand"
-	"net/http/httptest"
-	"strings"
-	"testing"
 )
 
 var (
diff --git a/auth/authentication.go b/auth/authentication.go
index 4ceed4f..56a7248 100644
--- a/auth/authentication.go
+++ b/auth/authentication.go
@@ -2,9 +2,10 @@ package auth
 
 import (
 	"errors"
+	"strings"
+
 	"github.com/gin-gonic/gin"
 	"github.com/jmattheis/memo/model"
-	"strings"
 )
 
 const (
diff --git a/auth/authentication_test.go b/auth/authentication_test.go
index c273c1c..5da2f35 100644
--- a/auth/authentication_test.go
+++ b/auth/authentication_test.go
@@ -2,14 +2,15 @@ package auth
 
 import (
 	"fmt"
+	"net/http/httptest"
+	"testing"
+
 	"github.com/gin-gonic/gin"
 	authmock "github.com/jmattheis/memo/auth/mock"
 	"github.com/jmattheis/memo/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
-	"net/http/httptest"
-	"testing"
 )
 
 func TestSuite(t *testing.T) {
diff --git a/auth/password_test.go b/auth/password_test.go
index cd7025c..0154225 100644
--- a/auth/password_test.go
+++ b/auth/password_test.go
@@ -1,8 +1,9 @@
 package auth
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestPasswordSuccess(t *testing.T) {
diff --git a/auth/token_test.go b/auth/token_test.go
index 31ac89e..71d7ee0 100644
--- a/auth/token_test.go
+++ b/auth/token_test.go
@@ -1,9 +1,10 @@
 package auth
 
 import (
-	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTokenHavePrefix(t *testing.T) {
diff --git a/auth/util_test.go b/auth/util_test.go
index 79fa3b9..7789414 100644
--- a/auth/util_test.go
+++ b/auth/util_test.go
@@ -1,12 +1,13 @@
 package auth
 
 import (
+	"net/http/httptest"
+	"testing"
+
 	"github.com/gin-gonic/gin"
 	"github.com/jmattheis/memo/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
-	"net/http/httptest"
-	"testing"
 )
 
 func TestUtilSuite(t *testing.T) {