diff --git a/alert/alert.go b/alert/alert.go
index 34a74d7427fc4e53cf97e0c94724f01f09d80371..41361be0ef00caeae3a7754275c170199ba5f8f4 100644
--- a/alert/alert.go
+++ b/alert/alert.go
@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"strings"
 	"time"
-	
+
 	"gitlab.cern.ch/ComputerSecurity/gocanary/clog"
 )
 
@@ -69,7 +69,6 @@ var config Config
 var syslogger *syslog.Writer
 var syslogEnabled bool
 
-
 func Initialize(slackhook string, silenceSeconds uint16, doSyslog bool) {
 	config = Config{SlackHook: slackhook, silenceSeconds: silenceSeconds}
 	if doSyslog {
diff --git a/clog/clog.go b/clog/clog.go
index b8d8cd94a16a5c39cc72c9df31ab30a53d924b72..04230180f8174ce3bdc27779ebafe64f1dd1ae55 100644
--- a/clog/clog.go
+++ b/clog/clog.go
@@ -1,102 +1,85 @@
 package clog
 
 import (
+	"context"
 	"fmt"
 	"log/slog"
 	"os"
-
-	"context"
 )
 
 const (
-    LevelFatal = slog.Level(16)
-    LevelPanic = slog.Level(12)
+	LevelFatal = slog.Level(16)
+	LevelPanic = slog.Level(12)
 )
 
-var LevelNames = map[slog.Level] string {
-    // slog.LevelDebug:  "DEBUG",
-    // slog.LevelInfo:   "INFO",
-    // slog.LevelWarn:   "WARN",
-    // slog.LevelError:  "ERROR",
-    LevelFatal:       "FATAL",
-    LevelPanic:       "PANIC",
+var LevelNames = map[slog.Level]string{
+	LevelFatal: "FATAL",
+	LevelPanic: "PANIC",
 }
 
-
 type CustomLogger struct {
-    *slog.Logger
+	*slog.Logger
 }
 
 var defaultLogger *CustomLogger
 
 func init() {
-    defaultLogger = NewCustomLogger()
-    slog.SetDefault(defaultLogger.Logger)
+	defaultLogger = NewCustomLogger()
+	slog.SetDefault(defaultLogger.Logger)
 }
 
 func NewCustomLogger() *CustomLogger {
+	// change level name
 	opts := slog.HandlerOptions{
-        ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
-            if a.Key == slog.LevelKey {
-                level := a.Value.Any().(slog.Level)
-                levelLabel, exists := LevelNames[level]
-                if !exists {
-                    levelLabel = level.String()
-                }
-
-                a.Value = slog.StringValue(levelLabel)
-            }
-
-            return a
-        },
-    }
-
-    handler := slog.NewJSONHandler(os.Stdout, &opts) 
-	
-	// change the level name with WithAttrs function
-
-
-    logger := slog.New(handler)
-    return &CustomLogger{Logger: logger}
+		ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
+			if a.Key == slog.LevelKey {
+				level := a.Value.Any().(slog.Level)
+				levelLabel, exists := LevelNames[level]
+				if !exists {
+					levelLabel = level.String()
+				}
+
+				a.Value = slog.StringValue(levelLabel)
+			}
+			return a
+		},
+	}
+
+	handler := slog.NewJSONHandler(os.Stdout, &opts)
+	logger := slog.New(handler)
+	return &CustomLogger{Logger: logger}
 }
 
 func (cl *CustomLogger) Log(level slog.Level, format string, v ...interface{}) {
-    msg := fmt.Sprintf(format, v...)
+	msg := fmt.Sprintf(format, v...)
 	cl.Logger.Log(context.Background(), level, msg)
-    if level == LevelFatal {
-        os.Exit(1)
-    } else if level == LevelPanic {
-        panic(msg)
-    } 
+	if level == LevelFatal {
+		os.Exit(1)
+	} else if level == LevelPanic {
+		panic(msg)
+	}
 }
 
-
-// func Log(level slog.Level, format string, v ...interface{}) {
-//     defaultLogger.Log(level, format, v...)
-// }
-
-
-
 func Info(format string, v ...interface{}) {
-    defaultLogger.Log(slog.LevelInfo, format, v...)
+	defaultLogger.Log(slog.LevelInfo, format, v...)
 }
 
 func Debug(format string, v ...interface{}) {
-    defaultLogger.Log(slog.LevelDebug, format, v...)
+	defaultLogger.Log(slog.LevelDebug, format, v...)
 }
 
 func Warn(format string, v ...interface{}) {
-    defaultLogger.Log(slog.LevelWarn, format, v...)
+	defaultLogger.Log(slog.LevelWarn, format, v...)
 }
 
 func Error(format string, v ...interface{}) {
-    defaultLogger.Log(slog.LevelError, format, v...)
+	defaultLogger.Log(slog.LevelError, format, v...)
 }
 
 func Panic(format string, v ...interface{}) {
-    defaultLogger.Log(LevelPanic, format, v...)
+	defaultLogger.Log(LevelPanic, format, v...)
 }
 
 func Fatal(format string, v ...interface{}) {
-    defaultLogger.Log(LevelFatal, format, v...)
-}
\ No newline at end of file
+	defaultLogger.Log(LevelFatal, format, v...)
+}
diff --git a/server/dns/dns.go b/server/dns/dns.go
index 8db97f252392d6d88ad96dcbe48c1695ed5d8c7d..c57092ac3d3abe527a66244ca5b3e4fa8b63099a 100644
--- a/server/dns/dns.go
+++ b/server/dns/dns.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/miekg/dns"
 	"gitlab.cern.ch/ComputerSecurity/gocanary/alert"
-	"gitlab.cern.ch/ComputerSecurity/gocanary/tokens"
 	"gitlab.cern.ch/ComputerSecurity/gocanary/clog"
+	"gitlab.cern.ch/ComputerSecurity/gocanary/tokens"
 )
 
 type DNSServerConfig struct {
@@ -98,7 +98,6 @@ func buildAnswer(q dns.Question, m *dns.Msg, canaryTriggered bool) {
 			m.Answer = append(m.Answer, rr)
 			m.Rcode = dns.RcodeNameError
 		}
-
 	}
 }
 
diff --git a/server/http/http.go b/server/http/http.go
index ddc2b280a8829ae3a4e9079e0fecacf796bdd60e..28eb7ce779eb6ae68fa108c5657650f34c18e804 100644
--- a/server/http/http.go
+++ b/server/http/http.go
@@ -13,9 +13,9 @@ import (
 	"time"
 
 	"gitlab.cern.ch/ComputerSecurity/gocanary/alert"
+	"gitlab.cern.ch/ComputerSecurity/gocanary/clog"
 	"gitlab.cern.ch/ComputerSecurity/gocanary/tokens"
 	"golang.org/x/crypto/acme/autocert"
-	"gitlab.cern.ch/ComputerSecurity/gocanary/clog"
 )
 
 type HTTPServerConfig struct {
@@ -155,7 +155,6 @@ func getTlsConfig(config HTTPServerConfig) *tls.Config {
 		}
 		return &tls.Config{Certificates: []tls.Certificate{cer}}
 	}
-
 }
 
 // Initialize autocert manager for let's encrypt certificates
diff --git a/tokens/tokens.go b/tokens/tokens.go
index 09516f244cf9aee33592801b25907c13f3865856..e68fb6ffd940460d4a7a8035445f552c06ec5757 100644
--- a/tokens/tokens.go
+++ b/tokens/tokens.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"gopkg.in/yaml.v2"
 	"gitlab.cern.ch/ComputerSecurity/gocanary/clog"
+	"gopkg.in/yaml.v2"
 )
 
 type CanaryRecord struct {