diff --git a/v1/cmd/blink/main.go b/v1/cmd/blink/main.go
index c9307a1..39aab61 100644
--- a/v1/cmd/blink/main.go
+++ b/v1/cmd/blink/main.go
@@ -179,12 +179,7 @@ func init() {
 
 func main() {
 	if err := rootCmd.Execute(); err != nil {
-		panic(err)
+		log.Err(err).Msg("")
+		os.Exit(1)
 	}
 }
-
-// Todo:
-// Clean up main.go
-// Fix warning logs
-// Fix wildcard log (Separate the main, use a function instead)
-// Complete all options