diff --git a/flags.go b/flags.go
index d46bf5d..3ea30b9 100644
--- a/flags.go
+++ b/flags.go
@@ -5,4 +5,4 @@ import (
 )
 
 var addr = flag.String("addr", ":8000", "http service address")
-var db_file = flag.String("db", "db.json", "output database")
+var dbFile = flag.String("db", "db.json", "output database")
diff --git a/handlers.go b/handlers.go
index 098af86..b922d0f 100644
--- a/handlers.go
+++ b/handlers.go
@@ -18,7 +18,7 @@ func passHandler(resp http.ResponseWriter, req *http.Request) {
 	if err != nil {
 		log.Fatal(err)
 	}
-	err = ioutil.WriteFile(*db_file, b, 0644)
+	err = ioutil.WriteFile(*dbFile, b, 0644)
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/main.go b/main.go
index a5c45bd..5353c93 100644
--- a/main.go
+++ b/main.go
@@ -22,8 +22,8 @@ var creds = make([]Cred, 0)
 var m = sync.Mutex{}
 var templates *template.Template
 
-func init_db() {
-	b, err := ioutil.ReadFile(*db_file)
+func initDb() {
+	b, err := ioutil.ReadFile(*dbFile)
 	if err != nil {
 		log.Println("Problem opening db file ... ignoring ...", err)
 	}
@@ -36,7 +36,7 @@ func init_db() {
 
 func main() {
 	flag.Parse()
-	init_db()
+	initDb()
 
 	http.HandleFunc("/pass", passHandler)
 	http.HandleFunc("/api/1.0/creds/", credHandler)