diff --git a/cmd/mev-bot/dex_integration.go b/cmd/mev-bot/dex_integration.go
index 907b3cb..8673965 100644
--- a/cmd/mev-bot/dex_integration.go
+++ b/cmd/mev-bot/dex_integration.go
@@ -4,6 +4,7 @@ import (
 	"log/slog"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+
 	"github.com/fraktal/mev-beta/pkg/dex"
 )
 
diff --git a/cmd/mev-bot/main.go b/cmd/mev-bot/main.go
index 6cf9a79..ff62e52 100644
--- a/cmd/mev-bot/main.go
+++ b/cmd/mev-bot/main.go
@@ -20,6 +20,7 @@ import (
 	"github.com/fraktal/mev-beta/internal/config"
 	"github.com/fraktal/mev-beta/internal/logger"
 	"github.com/fraktal/mev-beta/internal/monitoring"
+
 	// "github.com/fraktal/mev-beta/internal/tokens" // Not used - pool discovery disabled
 	"github.com/fraktal/mev-beta/pkg/arbitrage"
 	"github.com/fraktal/mev-beta/pkg/metrics"
diff --git a/pkg/arbitrage/flash_executor.go b/pkg/arbitrage/flash_executor.go
index 748ba93..77e0cae 100644
--- a/pkg/arbitrage/flash_executor.go
+++ b/pkg/arbitrage/flash_executor.go
@@ -1220,7 +1220,7 @@ func (executor *FlashSwapExecutor) convertGasCostToTokenUnits(gasCostWei *big.In
 
 func defaultTokenRegistry() map[common.Address]tokenDescriptor {
 	registry := map[common.Address]tokenDescriptor{
-		common.Address{}: newTokenDescriptor("ETH", 18, 2000.0),
+		{}: newTokenDescriptor("ETH", 18, 2000.0),
 		common.HexToAddress("0x82aF49447D8a07e3bd95BD0d56f35241523fBab1"): newTokenDescriptor("WETH", 18, 2000.0),
 		common.HexToAddress("0xaF88d065e77c8cC2239327C5EDb3A432268e5831"): newTokenDescriptor("USDC", 6, 1.0),
 		common.HexToAddress("0xff970a61a04b1ca14834a43f5de4533ebddb5cc8"): newTokenDescriptor("USDC.e", 6, 1.0),
diff --git a/pkg/arbitrum/parser/core_multicall_fixture_test.go b/pkg/arbitrum/parser/core_multicall_fixture_test.go
index 0afdcad..f2f23c6 100644
--- a/pkg/arbitrum/parser/core_multicall_fixture_test.go
+++ b/pkg/arbitrum/parser/core_multicall_fixture_test.go
@@ -8,8 +8,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/fraktal/mev-beta/pkg/calldata"
 	"github.com/stretchr/testify/require"
+
+	"github.com/fraktal/mev-beta/pkg/calldata"
 )
 
 type multicallFixture struct {
diff --git a/pkg/arbitrum/rpc_client_helper.go b/pkg/arbitrum/rpc_client_helper.go
index 4200ac8..1f0456e 100644
--- a/pkg/arbitrum/rpc_client_helper.go
+++ b/pkg/arbitrum/rpc_client_helper.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/ethclient"
+
 	"github.com/fraktal/mev-beta/internal/config"
 	"github.com/fraktal/mev-beta/internal/logger"
 )
diff --git a/pkg/dex/integration.go b/pkg/dex/integration.go
index 48a2138..1ec54e8 100644
--- a/pkg/dex/integration.go
+++ b/pkg/dex/integration.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
+
 	"github.com/fraktal/mev-beta/pkg/types"
 )
 
diff --git a/pkg/monitor/concurrent.go b/pkg/monitor/concurrent.go
index 6e60b94..d7cd1e3 100644
--- a/pkg/monitor/concurrent.go
+++ b/pkg/monitor/concurrent.go
@@ -18,6 +18,8 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
+	"golang.org/x/time/rate"
+
 	"github.com/fraktal/mev-beta/internal/config"
 	"github.com/fraktal/mev-beta/internal/logger"
 	"github.com/fraktal/mev-beta/internal/ratelimit"
@@ -32,7 +34,6 @@ import (
 	"github.com/fraktal/mev-beta/pkg/scanner"
 	arbitragetypes "github.com/fraktal/mev-beta/pkg/types"
 	"github.com/fraktal/mev-beta/pkg/uniswap"
-	"golang.org/x/time/rate"
 )
 
 // safeConvertInt64ToUint64 safely converts an int64 to uint64, ensuring no negative values
diff --git a/pkg/pools/blacklist.go b/pkg/pools/blacklist.go
index 032fdcf..c9a7281 100644
--- a/pkg/pools/blacklist.go
+++ b/pkg/pools/blacklist.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/fraktal/mev-beta/internal/logger"
 )
 
diff --git a/pkg/scanner/market/pool_validator.go b/pkg/scanner/market/pool_validator.go
index 5b2f706..3412b81 100644
--- a/pkg/scanner/market/pool_validator.go
+++ b/pkg/scanner/market/pool_validator.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
+
 	"github.com/fraktal/mev-beta/internal/logger"
 )
 
diff --git a/pkg/scanner/parsing_monitor.go b/pkg/scanner/parsing_monitor.go
index fe3692e..0cadde7 100644
--- a/pkg/scanner/parsing_monitor.go
+++ b/pkg/scanner/parsing_monitor.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/fraktal/mev-beta/internal/logger"
 )
 
diff --git a/pkg/security/anomaly_detector.go b/pkg/security/anomaly_detector.go
index cda2b0e..7768bbe 100644
--- a/pkg/security/anomaly_detector.go
+++ b/pkg/security/anomaly_detector.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/fraktal/mev-beta/internal/logger"
 )
 
diff --git a/pkg/tokens/metadata_cache.go b/pkg/tokens/metadata_cache.go
index dc3356d..c003f89 100644
--- a/pkg/tokens/metadata_cache.go
+++ b/pkg/tokens/metadata_cache.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/fraktal/mev-beta/internal/logger"
 )