diff --git a/main.go b/main.go
index 1f0300a..6bd4e5b 100644
--- a/main.go
+++ b/main.go
@@ -7,33 +7,44 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
-	"time"
 )
 
 func main() {
 	cfg := loadConfig()
+
+	// Set up structured logging
 	slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, nil)))
 
-	db, err := initDB(cfg.DBPath)
+	// Initialize database
+	db, err := InitDB(cfg.DBPath)
 	if err != nil {
 		slog.Error("failed to init database", "error", err)
 		os.Exit(1)
 	}
 	defer db.Close()
 
-	perm := newPermanentWhitelist()
-	tw := newTempWhitelist()
+	// Start background cleanup of expired temp entries
+	go cleanupLoop(db, cfg.CleanupInterval)
 
-	watcher := newPermanentWhitelistWatcher(cfg.PermanentWhitelistFile, cfg.WatchInterval, perm)
-	watcher.start()
+	// Setup HTTP server
+	mux := http.NewServeMux()
+	mux.HandleFunc("/auth", authHandler(cfg, db))
+	mux.HandleFunc("/api/whitelist/temp", whitelistTempHandler(cfg, db))
+	mux.HandleFunc("/api/whitelist/temp/list", whitelistListHandler(cfg, db))
+	mux.HandleFunc("/api/whitelist/temp/{ip}", whitelistDeleteHandler(cfg, db))
+	mux.HandleFunc("/api/whitelist/perm", permWhitelistAddHandler(cfg, db))
+	mux.HandleFunc("/api/whitelist/perm/{entry}", permWhitelistDeleteHandler(cfg, db))
+	mux.HandleFunc("/api/logs", logsHandler(cfg, db))
+	mux.HandleFunc("/status", statusHandler)
 
-	go cleanupLoop(tw, cfg.CleanupInterval)
+	server := &http.Server{
+		Addr:    ":" + cfg.Port,
+		Handler: mux,
+		// timeouts as before
+	}
 
-	server := newAuthServer(cfg, tw, perm, db)
-
-	addr := ":" + cfg.Port
 	go func() {
-		slog.Info("starting server", "addr", addr)
+		slog.Info("server listening", "addr", server.Addr)
 		if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			slog.Error("server error", "error", err)
 			os.Exit(1)
@@ -47,24 +58,5 @@ func main() {
 	slog.Info("shutting down...")
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
-	if err := server.Shutdown(ctx); err != nil {
-		slog.Error("shutdown error", "error", err)
-	}
-}
-
-func newAuthServer(cfg Config, tw *tempWhitelist, perm *PermanentWhitelist, db *sql.DB) *http.Server {
-	mux := http.NewServeMux()
-	mux.HandleFunc("/auth", authHandler(cfg, tw, perm))
-	mux.HandleFunc("/api/whitelist/temp", tw.whitelistTempHandler(cfg, db))
-	mux.HandleFunc("/api/whitelist", tw.whitelistListHandler(cfg))
-	mux.HandleFunc("/api/whitelist/{ip}", tw.whitelistDeleteHandler(cfg, db))
-	mux.HandleFunc("/api/logs", logsHandler(cfg, db))
-	mux.HandleFunc("/status", statusHandler)
-
-	return &http.Server{
-		Addr:         ":" + cfg.Port,
-		Handler:      mux,
-		ReadTimeout:  10 * time.Second,
-		WriteTimeout: 30 * time.Second,
-	}
+	server.Shutdown(ctx)
 }
\ No newline at end of file