diff --git a/server/crawler.go b/server/crawler.go
index c0c12ef..28eb5b8 100644
--- a/server/crawler.go
+++ b/server/crawler.go
@@ -270,7 +270,7 @@ func listItems(f storage.Feed, db *storage.Storage) ([]storage.Item, error) {
 	}
 	defer res.Body.Close()
 
-	if res.StatusCode / 100 == 4 || res.StatusCode / 100 == 5 {
+	if res.StatusCode/100 == 4 || res.StatusCode/100 == 5 {
 		errmsg := fmt.Sprintf("Failed to list feed items for %s (status: %d)", f.FeedLink, res.StatusCode)
 		return nil, errors.New(errmsg)
 	}
@@ -299,7 +299,7 @@ func init() {
 		DialContext: (&net.Dialer{
 			Timeout: 10 * time.Second,
 		}).DialContext,
-		DisableKeepAlives: true,
+		DisableKeepAlives:   true,
 		TLSHandshakeTimeout: time.Second * 10,
 	}
 	httpClient := &http.Client{
diff --git a/server/fever.go b/server/fever.go
index 9fe3d28..2780168 100644
--- a/server/fever.go
+++ b/server/fever.go
@@ -13,10 +13,10 @@ var feverHandlers = map[string]func(rw http.ResponseWriter, req *http.Request){
 	"unread_item_ids": FeverFilteredItemIDsHandler,
 	"saved_item_ids":  FeverFilteredItemIDsHandler,
 
-	"favicons":        FeverFaviconsHandler,
-	"items":           FeverItemsHandler,
-	"links":           FeverLinksHandler,
-	"mark":            FeverMarkHandler,
+	"favicons": FeverFaviconsHandler,
+	"items":    FeverItemsHandler,
+	"links":    FeverLinksHandler,
+	"mark":     FeverMarkHandler,
 }
 
 type FeverGroup struct {
diff --git a/server/handlers.go b/server/handlers.go
index ad30790..3d4c300 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -2,9 +2,9 @@ package server
 
 import (
 	"bytes"
-	"encoding/json"
-	"encoding/base64"
 	"compress/gzip"
+	"encoding/base64"
+	"encoding/json"
 	"fmt"
 	"github.com/nkanaev/yarr/storage"
 	"html"
@@ -43,7 +43,7 @@ var routes []Route = []Route{
 
 type asset struct {
 	etag    string
-	body    string  // base64(gzip(content))
+	body    string // base64(gzip(content))
 	gzipped *[]byte
 	decoded *string
 }
diff --git a/server/response.go b/server/response.go
index 8a22085..d80ba18 100644
--- a/server/response.go
+++ b/server/response.go
@@ -2,8 +2,8 @@ package server
 
 import (
 	"encoding/json"
-	"net/http"
 	"log"
+	"net/http"
 )
 
 func writeJSON(rw http.ResponseWriter, data interface{}) {
diff --git a/storage/http.go b/storage/http.go
index 2a13915..e0396c9 100644
--- a/storage/http.go
+++ b/storage/http.go
@@ -8,8 +8,8 @@ type HTTPState struct {
 	FeedID        int64
 	LastRefreshed time.Time
 
-	LastModified  string
-	Etag          string
+	LastModified string
+	Etag         string
 }
 
 func (s *Storage) GetHTTPState(feedID int64) *HTTPState {
diff --git a/storage/item.go b/storage/item.go
index 27eac2b..e24a9d8 100644
--- a/storage/item.go
+++ b/storage/item.go
@@ -356,7 +356,7 @@ func (s *Storage) DeleteOldItems() {
 			delete from items where feed_id = ? and status != ? and date_arrived < ?`,
 			feedId,
 			STARRED,
-			time.Now().Add(-time.Hour*24*90),  // 90 days
+			time.Now().Add(-time.Hour*24*90), // 90 days
 		)
 		if err != nil {
 			s.log.Print(err)
diff --git a/storage/settings.go b/storage/settings.go
index eaa25c7..5d08837 100644
--- a/storage/settings.go
+++ b/storage/settings.go
@@ -4,15 +4,15 @@ import "encoding/json"
 
 func settingsDefaults() map[string]interface{} {
 	return map[string]interface{}{
-		"filter":          "",
-		"feed":            "",
-		"feed_list_width": 300,
-		"item_list_width": 300,
+		"filter":            "",
+		"feed":              "",
+		"feed_list_width":   300,
+		"item_list_width":   300,
 		"sort_newest_first": true,
-		"theme_name": "light",
-		"theme_font": "",
-		"theme_size": 1,
-		"refresh_rate": 0,
+		"theme_name":        "light",
+		"theme_font":        "",
+		"theme_size":        1,
+		"refresh_rate":      0,
 	}
 }