diff --git a/pkg/connect.go b/pkg/connect.go
index 72fc976b..4a3f5b8f 100644
--- a/pkg/connect.go
+++ b/pkg/connect.go
@@ -42,22 +42,20 @@ var connectCmd = &cobra.Command{
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		util.SetupLogger()
+		util.SetupLogger(util.Debug)
 		InitClient()
 		Main()
 	},
 	PostRun: func(_ *cobra.Command, _ []string) {
 		if util.IsWindows() {
-			err := retry.OnError(retry.DefaultRetry, func(err error) bool {
+			if err := retry.OnError(retry.DefaultRetry, func(err error) bool {
 				return err != nil
 			}, func() error {
 				return driver.UninstallWireGuardTunDriver()
-			})
-			if err != nil {
+			}); err != nil {
 				wd, _ := os.Getwd()
 				filename := filepath.Join(wd, "wintun.dll")
-				err = os.Rename(filename, filepath.Join(os.TempDir(), "wintun.dll"))
-				if err != nil {
+				if err = os.Rename(filename, filepath.Join(os.TempDir(), "wintun.dll")); err != nil {
 					log.Warn(err)
 				}
 			}
diff --git a/pkg/serve.go b/pkg/serve.go
index 88b5802a..db248541 100644
--- a/pkg/serve.go
+++ b/pkg/serve.go
@@ -21,7 +21,7 @@ var ServerCmd = &cobra.Command{
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		util.SetupLogger()
+		util.SetupLogger(util.Debug)
 		if err := start(); err != nil {
 			log.Fatal(err)
 		}
diff --git a/util/log.go b/util/log.go
index 0b62e0e9..38838044 100644
--- a/util/log.go
+++ b/util/log.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 )
 
-func SetupLogger() {
-	if Debug {
+func SetupLogger(debug bool) {
+	if debug {
 		log.SetLevel(log.DebugLevel)
 	}
 	log.SetReportCaller(true)