diff --git a/bcrypt/verifier.go b/bcrypt/verifier.go
index a7d18a6..a719190 100644
--- a/bcrypt/verifier.go
+++ b/bcrypt/verifier.go
@@ -6,17 +6,17 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
-// Verifier verifys passwords using Bcrypt
+// Verifier verifys passwords using Bcrypt.
 type Verifier struct {
 	cost int
 }
 
-// Verify verifys a Password
-func (bv *Verifier) Verify(password string, hashOnDb string) error {
-	return bcrypt.CompareHashAndPassword([]byte(hashOnDb), []byte(password))
+// Verify verifys a Password.
+func (bv *Verifier) Verify(password string, hashOnDB string) error {
+	return bcrypt.CompareHashAndPassword([]byte(hashOnDB), []byte(password))
 }
 
-// Hash calculates a hash to be stored on the database
+// Hash calculates a hash to be stored on the database.
 func (bv *Verifier) Hash(password string) (string, error) {
 	hash, err := bcrypt.GenerateFromPassword([]byte(password), bv.cost)
 	if err != nil {
diff --git a/cmd/budgeteer/main.go b/cmd/budgeteer/main.go
index 18ac498..9564855 100644
--- a/cmd/budgeteer/main.go
+++ b/cmd/budgeteer/main.go
@@ -3,8 +3,7 @@ package main
 import (
 	"io/fs"
 	"log"
-
-	netHttp "net/http"
+	"net/http"
 
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/config"
@@ -34,7 +33,7 @@ func main() {
 		Service:             q,
 		TokenVerifier:       &jwt.TokenVerifier{},
 		CredentialsVerifier: &bcrypt.Verifier{},
-		StaticFS:            netHttp.FS(static),
+		StaticFS:            http.FS(static),
 	}
 
 	handler.Serve()
diff --git a/jwt/login.go b/jwt/login.go
index 4bc5f04..dedf8ef 100644
--- a/jwt/login.go
+++ b/jwt/login.go
@@ -11,8 +11,7 @@ import (
 )
 
 // TokenVerifier verifies Tokens
-type TokenVerifier struct {
-}
+type TokenVerifier struct{}
 
 // Token contains everything to authenticate a user
 type Token struct {
diff --git a/postgres/conn.go b/postgres/conn.go
index 6a5c814..86f6de2 100644
--- a/postgres/conn.go
+++ b/postgres/conn.go
@@ -5,8 +5,9 @@ import (
 	"embed"
 	"fmt"
 
-	_ "github.com/jackc/pgx/v4/stdlib" // needed for pg connection
 	"github.com/pressly/goose/v3"
+
+	_ "github.com/jackc/pgx/v4/stdlib" // needed for pg connection
 )
 
 //go:embed schema/*.sql
diff --git a/postgres/ynab-import.go b/postgres/ynab-import.go
index 0ca9ba7..c2b0ba4 100644
--- a/postgres/ynab-import.go
+++ b/postgres/ynab-import.go
@@ -50,7 +50,6 @@ func NewYNABImport(context context.Context, q *Queries, budgetID uuid.UUID) (*YN
 		queries:        q,
 		budgetID:       budgetID,
 	}, nil
-
 }
 
 // ImportAssignments expects a TSV-file as exported by YNAB in the following format:
@@ -147,7 +146,7 @@ func (ynab *YNABImport) ImportTransactions(context context.Context, r io.Reader)
 			return fmt.Errorf("parse date %s: %w", dateString, err)
 		}
 
-		categoryGroup, categoryName := record[5], record[6] //also in 4 joined by :
+		categoryGroup, categoryName := record[5], record[6] // also in 4 joined by :
 		category, err := ynab.GetCategory(context, categoryGroup, categoryName)
 		if err != nil {
 			return fmt.Errorf("get category %s/%s: %w", categoryGroup, categoryName, err)
diff --git a/server/account_test.go b/server/account_test.go
index af1869e..da68522 100644
--- a/server/account_test.go
+++ b/server/account_test.go
@@ -1,4 +1,4 @@
-package server_test
+package server
 
 import (
 	"encoding/json"
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/gin-gonic/gin"
+
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/jwt"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"git.javil.eu/jacob1123/budgeteer/server"
-	"github.com/gin-gonic/gin"
 
 	txdb "github.com/DATA-DOG/go-txdb"
 )
@@ -27,7 +27,7 @@ func TestListTimezonesHandler(t *testing.T) {
 		return
 	}
 
-	h := server.Handler{
+	h := Handler{
 		Service:             database,
 		TokenVerifier:       &jwt.TokenVerifier{},
 		CredentialsVerifier: &bcrypt.Verifier{},
@@ -50,7 +50,7 @@ func TestListTimezonesHandler(t *testing.T) {
 			t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
 		}
 
-		var response server.LoginResponse
+		var response LoginResponse
 		err = json.NewDecoder(recorder.Body).Decode(&response)
 		if err != nil {
 			t.Error(err.Error())
@@ -67,7 +67,7 @@ func TestListTimezonesHandler(t *testing.T) {
 			t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
 		}
 
-		var response server.TransactionsResponse
+		var response TransactionsResponse
 		err = json.NewDecoder(recorder.Body).Decode(&response)
 		if err != nil {
 			t.Error(err.Error())