diff --git a/contentserver.go b/contentserver.go
index 7f1cc79..8bd9ed6 100644
--- a/contentserver.go
+++ b/contentserver.go
@@ -29,13 +29,15 @@ const (
 
 var (
 	uniqushPushVersion = "content-server 1.5.0"
-	showVersionFlag    = flag.Bool("version", false, "version info")
-	address            = flag.String("address", "", "address to bind socket server host:port")
-	webserverAddress   = flag.String("webserver-address", "", "address to bind web server host:port, when empty no webserver will be spawned")
-	webserverPath      = flag.String("webserver-path", "/contentserver", "path to export the webserver on - useful when behind a proxy")
-	varDir             = flag.String("var-dir", "/var/lib/contentserver", "where to put my data")
-	flagFreeOSMem      = flag.Int("free-os-mem", 0, "free OS mem every X minutes")
-	logLevelOptions    = []string{
+
+	flagShowVersionFlag  = flag.Bool("version", false, "version info")
+	flagAddress          = flag.String("address", "", "address to bind socket server host:port")
+	flagWebserverAddress = flag.String("webserver-address", "", "address to bind web server host:port, when empty no webserver will be spawned")
+	flagWebserverPath    = flag.String("webserver-path", "/contentserver", "path to export the webserver on - useful when behind a proxy")
+	flagVarDir           = flag.String("var-dir", "/var/lib/contentserver", "where to put my data")
+	flagFreeOSMem        = flag.Int("free-os-mem", 0, "free OS mem every X minutes")
+
+	logLevelOptions = []string{
 		logLevelError,
 		logLevelRecord,
 		logLevelWarning,
@@ -61,7 +63,7 @@ func exitUsage(code int) {
 func main() {
 	flag.Parse()
 
-	if *showVersionFlag {
+	if *flagShowVersionFlag {
 		fmt.Printf("%v\n", uniqushPushVersion)
 		return
 	}
@@ -77,7 +79,8 @@ func main() {
 	}
 
 	if len(flag.Args()) == 1 {
-		fmt.Println(*address, flag.Arg(0))
+		fmt.Println(*flagAddress, flag.Arg(0))
+
 		level := log.LevelRecord
 		switch *logLevel {
 		case logLevelError:
@@ -92,10 +95,12 @@ func main() {
 			level = log.LevelDebug
 		}
 		log.SelectedLevel = level
+
+		// kickoff metric handlers
 		go metrics.RunPrometheusHandler(DefaultPrometheusListener)
 		go status.RunHealthzHandlerListener(DefaultHealthzHandlerAddress, ServiceName)
 
-		err := server.RunServerSocketAndWebServer(flag.Arg(0), *address, *webserverAddress, *webserverPath, *varDir)
+		err := server.RunServerSocketAndWebServer(flag.Arg(0), *flagAddress, *flagWebserverAddress, *flagWebserverPath, *flagVarDir)
 		if err != nil {
 			fmt.Println("exiting with error", err)
 			os.Exit(1)