diff --git a/main.go b/main.go
index ee84667..e6aced7 100644
--- a/main.go
+++ b/main.go
@@ -27,23 +27,16 @@ type Moment struct {
 func main() {
 	fmt.Println("Starting tracking backend server")
 
-	path := DBFilename
-	db, err := bolt.Open(path, 0666, nil)
+	db, err := bolt.Open(DBFilename, 0666, nil)
 	if err != nil {
 		log.Println(err)
 		return
 	}
 	defer db.Close()
 
-	indieAuthHandler := &IndieAuthHandler{}
-	http.Handle("/auth/", http.StripPrefix("/auth/", indieAuthHandler))
-
-	ih := &indexHandler{DB: db}
-	http.Handle("/", ih)
-
-	mh := &momentHandler{DB: db}
-	http.Handle("/moment", mh)
-
+	http.Handle("/auth/", http.StripPrefix("/auth/", &IndieAuthHandler{}))
+	http.Handle("/", &indexHandler{DB: db})
+	http.Handle("/moment", &momentHandler{DB: db})
 	log.Fatal(http.ListenAndServe(":8096", nil))
 }