diff --git a/cmd/loop/main.go b/cmd/loop/main.go
index 35d01a4..e2f213e 100644
--- a/cmd/loop/main.go
+++ b/cmd/loop/main.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/btcsuite/btcd/btcutil"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop"
 	"github.com/lightninglabs/loop/loopd"
@@ -21,9 +22,6 @@ import (
 	"github.com/lightninglabs/protobuf-hex-display/proto"
 	"github.com/lightningnetwork/lnd/lncfg"
 	"github.com/lightningnetwork/lnd/macaroons"
-
-	"github.com/btcsuite/btcd/btcutil"
-
 	"github.com/urfave/cli"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
diff --git a/loopd/swapclient_server_debug.go b/loopd/swapclient_server_debug.go
index d1f9465..e54da3e 100644
--- a/loopd/swapclient_server_debug.go
+++ b/loopd/swapclient_server_debug.go
@@ -7,10 +7,9 @@ import (
 	"context"
 	"fmt"
 
-	"gopkg.in/macaroon-bakery.v2/bakery"
-
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/looprpc"
+	"gopkg.in/macaroon-bakery.v2/bakery"
 )
 
 var (
diff --git a/server_mock_test.go b/server_mock_test.go
index 2f12f2e..3e928a6 100644
--- a/server_mock_test.go
+++ b/server_mock_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"testing"
-
 	"time"
 
 	"github.com/btcsuite/btcd/btcutil"