diff --git a/internal/storage/ban_db.go b/internal/storage/ban_db.go
index 46f5312..7d1d710 100644
--- a/internal/storage/ban_db.go
+++ b/internal/storage/ban_db.go
@@ -3,12 +3,13 @@ package storage
 import (
 	"database/sql"
 	"fmt"
+	"os"
+	"time"
+
 	"github.com/d3m0k1d/BanForge/internal/config"
 	"github.com/d3m0k1d/BanForge/internal/logger"
 	"github.com/jedib0t/go-pretty/v6/table"
 	_ "modernc.org/sqlite"
-	"os"
-	"time"
 )
 
 // Writer block
@@ -18,7 +19,10 @@ type BanWriter struct {
 }
 
 func NewBanWriter() (*BanWriter, error) {
-	db, err := sql.Open("sqlite", "/var/lib/banforge/bans.db?_pragma=journal_mode(WAL)&_pragma=busy_timeout(30000)&_pragma=synchronous(NORMAL)")
+	db, err := sql.Open(
+		"sqlite",
+		"/var/lib/banforge/bans.db?_pragma=journal_mode(WAL)&_pragma=busy_timeout(30000)&_pragma=synchronous(NORMAL)",
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -83,7 +87,11 @@ func (w *BanWriter) RemoveExpiredBans() ([]string, error) {
 		w.logger.Error("Failed to get expired bans", "error", err)
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			w.logger.Error("Failed to close rows", "error", err)
+		}
+	}()
 
 	for rows.Next() {
 		var ip string
diff --git a/internal/storage/db.go b/internal/storage/db.go
index 8ee4eac..88b24de 100644
--- a/internal/storage/db.go
+++ b/internal/storage/db.go
@@ -3,6 +3,7 @@ package storage
 import (
 	"database/sql"
 	"fmt"
+
 	_ "modernc.org/sqlite"
 )
 
@@ -17,7 +18,11 @@ func CreateTables() error {
 	if err != nil {
 		return fmt.Errorf("failed to open requests db: %w", err)
 	}
-	defer db_r.Close()
+	defer func() {
+		if err != nil {
+			db_r.Close()
+		}
+	}()
 
 	_, err = db_r.Exec(CreateRequestsTable)
 	if err != nil {
@@ -34,7 +39,11 @@ func CreateTables() error {
 	if err != nil {
 		return fmt.Errorf("failed to open bans db: %w", err)
 	}
-	defer db_b.Close()
+	defer func() {
+		if err != nil {
+			db_b.Close()
+		}
+	}()
 
 	_, err = db_b.Exec(CreateBansTable)
 	if err != nil {
diff --git a/internal/storage/requests_db.go b/internal/storage/requests_db.go
index e64e65b..de29c2a 100644
--- a/internal/storage/requests_db.go
+++ b/internal/storage/requests_db.go
@@ -2,6 +2,7 @@ package storage
 
 import (
 	"database/sql"
+
 	"github.com/d3m0k1d/BanForge/internal/logger"
 	_ "modernc.org/sqlite"
 )
@@ -12,7 +13,10 @@ type Request_Writer struct {
 }
 
 func NewRequestsWr() (*Request_Writer, error) {
-	db, err := sql.Open("sqlite", "/var/lib/banforge/requests.db?_pragma=journal_mode(WAL)&_pragma=busy_timeout(30000)&_pragma=synchronous(NORMAL)")
+	db, err := sql.Open(
+		"sqlite",
+		"/var/lib/banforge/requests.db?_pragma=journal_mode(WAL)&_pragma=busy_timeout(30000)&_pragma=synchronous(NORMAL)",
+	)
 	if err != nil {
 		return nil, err
 	}