diff --git a/cmd/server/main.go b/cmd/server/main.go
index 67fba91..bb2eb2f 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -13,12 +13,15 @@ import (
 	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
 )
 
+var (
+	// Define CLI flags
+	listenAddress   = flag.String("listenAddress", shared.DefaultServerConfig.ListenAddress, "IP address to listen on")
+	listenPort      = flag.Int("listenPort", shared.DefaultServerConfig.ListenPort, "Port to listen on")
+	password        = flag.String("password", "", "Control password for pomodoro session (optional)")
+	showVersionFlag = flag.Bool("version", false, "Output version")
+)
+
 func Start() {
-	// Define CLI flags for ListenAddress and ListenPort
-	listenAddress := flag.String("listenAddress", shared.DefaultServerConfig.ListenAddress, "IP address to listen on")
-	listenPort := flag.Int("listenPort", shared.DefaultServerConfig.ListenPort, "Port to listen on")
-	password := flag.String("password", "", "Control password for pomodoro session (optional)")
-	showVersionFlag := flag.Bool("version", false, "Output version")
 	flag.Parse()
 
 	if *showVersionFlag {