diff --git a/cmd/client/main.go b/cmd/client/main.go
index 7fdb573..80f3c5b 100644
--- a/cmd/client/main.go
+++ b/cmd/client/main.go
@@ -13,7 +13,8 @@ import (
 )
 
 var (
-	config             ChronoTomato.Config
+	config ChronoTomato.Config
+
 	parameter_url      = flag.String("url", "", "GoTomato Server URL (eg ws://localhost:8080/ws)")
 	parameter_password = flag.String("password", "", "Control password for pomodoro session")
 	configfile         = flag.String("config", "", "Path to config file")
diff --git a/internal/frontend/desktop.go b/internal/frontend/desktop.go
index 7a5e6f4..ee47394 100644
--- a/internal/frontend/desktop.go
+++ b/internal/frontend/desktop.go
@@ -8,8 +8,10 @@ import (
 
 func desktopNotifications(pomodoro GoTomato.ServerMessage) {
 
-	var duration int
-	var notification string
+	var (
+		duration     int
+		notification string
+	)
 
 	mode := pomodoro.Mode
 	session := pomodoro.Session
diff --git a/internal/frontend/terminal.go b/internal/frontend/terminal.go
index eddc631..f29447d 100644
--- a/internal/frontend/terminal.go
+++ b/internal/frontend/terminal.go
@@ -8,8 +8,10 @@ import (
 )
 
 func terminalOutput(pomodoro GoTomato.ServerMessage) {
-	var modePrefix string
-	var timerOutput string
+	var (
+		modePrefix  string
+		timerOutput string
+	)
 
 	fmt.Print("\033[H\033[2J") // Clears the screen