diff --git a/cmd/broadcaster-cli/app/utxos/consolidate/consolidate.go b/cmd/broadcaster-cli/app/utxos/consolidate/consolidate.go
index 9ade2af7b..1bd2b7cf8 100644
--- a/cmd/broadcaster-cli/app/utxos/consolidate/consolidate.go
+++ b/cmd/broadcaster-cli/app/utxos/consolidate/consolidate.go
@@ -3,7 +3,6 @@ package consolidate
 import (
 	"errors"
 	"fmt"
-	"github.com/bitcoin-sv/arc/internal/woc_client"
 	"log/slog"
 	"os"
 	"os/signal"
@@ -12,6 +11,7 @@ import (
 
 	"github.com/bitcoin-sv/arc/cmd/broadcaster-cli/helper"
 	"github.com/bitcoin-sv/arc/internal/broadcaster"
+	"github.com/bitcoin-sv/arc/internal/woc_client"
 )
 
 var Cmd = &cobra.Command{
diff --git a/cmd/broadcaster-cli/app/utxos/create/create.go b/cmd/broadcaster-cli/app/utxos/create/create.go
index 828c1cff6..ca4b780c6 100644
--- a/cmd/broadcaster-cli/app/utxos/create/create.go
+++ b/cmd/broadcaster-cli/app/utxos/create/create.go
@@ -3,7 +3,6 @@ package create
 import (
 	"errors"
 	"fmt"
-	"github.com/bitcoin-sv/arc/internal/woc_client"
 	"log"
 	"log/slog"
 	"os"
@@ -11,6 +10,7 @@ import (
 
 	"github.com/bitcoin-sv/arc/cmd/broadcaster-cli/helper"
 	"github.com/bitcoin-sv/arc/internal/broadcaster"
+	"github.com/bitcoin-sv/arc/internal/woc_client"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
diff --git a/internal/blocktx/server.go b/internal/blocktx/server.go
index 3256084eb..fcc83462e 100644
--- a/internal/blocktx/server.go
+++ b/internal/blocktx/server.go
@@ -5,13 +5,14 @@ import (
 	"log/slog"
 	"time"
 
-	"github.com/bitcoin-sv/arc/internal/blocktx/blocktx_api"
-	"github.com/bitcoin-sv/arc/internal/blocktx/store"
-	"github.com/bitcoin-sv/arc/internal/grpc_opts"
 	"github.com/libsv/go-p2p"
 	"google.golang.org/grpc/reflection"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/timestamppb"
+
+	"github.com/bitcoin-sv/arc/internal/blocktx/blocktx_api"
+	"github.com/bitcoin-sv/arc/internal/blocktx/store"
+	"github.com/bitcoin-sv/arc/internal/grpc_opts"
 )
 
 // Server type carries the logger within it.
diff --git a/pkg/api/handler/default.go b/pkg/api/handler/default.go
index 5c6ed543c..2c067231f 100644
--- a/pkg/api/handler/default.go
+++ b/pkg/api/handler/default.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/bitcoin-sv/arc/internal/woc_client"
 	"log/slog"
 	"net/http"
 	"net/url"
@@ -24,6 +23,7 @@ import (
 	beefValidator "github.com/bitcoin-sv/arc/internal/validator/beef"
 	defaultValidator "github.com/bitcoin-sv/arc/internal/validator/default"
 	"github.com/bitcoin-sv/arc/internal/version"
+	"github.com/bitcoin-sv/arc/internal/woc_client"
 	"github.com/bitcoin-sv/arc/pkg/api"
 	merkleverifier "github.com/bitcoin-sv/arc/pkg/api/handler/internal/MerkeVerifier"
 	txfinder "github.com/bitcoin-sv/arc/pkg/api/handler/internal/TxFinder"