Peers.go      | 1 +
 bep40.go      | 1 -
 client.go     | 3 +--
 config.go     | 4 ++--
 connection.go | 1 -
 global.go     | 3 ++-
 handshake.go  | 2 +-
 misc.go       | 3 ++-
 portfwd.go    | 1 -
 socket.go     | 3 +--

diff --git a/Peers.go b/Peers.go
index 5c9f20431c284499b26316795743183eda2f002f..12dda6bccbfc351cebb9cc8e5298b359c7319a3b 100644
--- a/Peers.go
+++ b/Peers.go
@@ -2,6 +2,7 @@ package torrent
 
 import (
 	"github.com/anacrolix/dht/krpc"
+
 	"github.com/anacrolix/torrent/tracker"
 )
 
diff --git a/bep40.go b/bep40.go
index e7debc748561e3f93c7b40a98c0cfdfa4ec5dcd9..5930247f15d6116299f0051baed218115de3b589 100644
--- a/bep40.go
+++ b/bep40.go
@@ -6,7 +6,6 @@ 	"encoding/binary"
 	"errors"
 	"fmt"
 	"hash/crc32"
-
 	"net"
 )
 
diff --git a/client.go b/client.go
index d4f8640e68e6883ab9f8b42131c06fe515a6d558..664abb203a760170a87b2ae90916d90895ea117e 100644
--- a/client.go
+++ b/client.go
@@ -14,12 +14,11 @@ 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/anacrolix/missinggo/perf"
-
 	"github.com/anacrolix/dht"
 	"github.com/anacrolix/dht/krpc"
 	"github.com/anacrolix/log"
 	"github.com/anacrolix/missinggo"
+	"github.com/anacrolix/missinggo/perf"
 	"github.com/anacrolix/missinggo/pproffd"
 	"github.com/anacrolix/missinggo/pubsub"
 	"github.com/anacrolix/missinggo/slices"
diff --git a/config.go b/config.go
index 0c6141c6f39157d4e31ebc220f6fc404f7ae04f7..6994a37ff7123db90da5ed9f720b003adb6c737a 100644
--- a/config.go
+++ b/config.go
@@ -7,11 +7,11 @@ 	"net/http"
 	"net/url"
 	"time"
 
-	"golang.org/x/time/rate"
-
 	"github.com/anacrolix/dht"
 	"github.com/anacrolix/missinggo"
 	"github.com/anacrolix/missinggo/expect"
+	"golang.org/x/time/rate"
+
 	"github.com/anacrolix/torrent/iplist"
 	"github.com/anacrolix/torrent/storage"
 )
diff --git a/connection.go b/connection.go
index 7bad4f27624a814727be41beff6818cb22840b60..41eb47bd9160f89cdccd9314402f2f44481a771b 100644
--- a/connection.go
+++ b/connection.go
@@ -16,7 +16,6 @@ 	"time"
 
 	"github.com/anacrolix/dht"
 	"github.com/anacrolix/log"
-
 	"github.com/anacrolix/missinggo"
 	"github.com/anacrolix/missinggo/bitmap"
 	"github.com/anacrolix/missinggo/iter"
diff --git a/global.go b/global.go
index 1de8539b3eb94a31223a8f8bf120ae84c3c5180d..99e3df2e850415ca9308c4e6ff7a368847179f5f 100644
--- a/global.go
+++ b/global.go
@@ -1,9 +1,10 @@
 package torrent
 
 import (
-	pp "github.com/anacrolix/torrent/peer_protocol"
 	"crypto"
 	"expvar"
+
+	pp "github.com/anacrolix/torrent/peer_protocol"
 )
 
 const (
diff --git a/handshake.go b/handshake.go
index 25730f31e5475565a883decd26adb9fb2f0292ab..b901b7abe144f116588ac830a9cced82e527e7a1 100644
--- a/handshake.go
+++ b/handshake.go
@@ -71,4 +71,4 @@ 	})
 	return
 }
 
-type PeerExtensionBits=pp.PeerExtensionBits
\ No newline at end of file
+type PeerExtensionBits = pp.PeerExtensionBits
diff --git a/misc.go b/misc.go
index ecf91788fcd748dbe9fb6d597f739a170b56d5d5..d1b92c4f95daef2da256b4d078b631b1ca860117 100644
--- a/misc.go
+++ b/misc.go
@@ -5,9 +5,10 @@ 	"errors"
 	"net"
 
 	"github.com/anacrolix/missinggo"
+	"golang.org/x/time/rate"
+
 	"github.com/anacrolix/torrent/metainfo"
 	pp "github.com/anacrolix/torrent/peer_protocol"
-	"golang.org/x/time/rate"
 )
 
 type chunkSpec struct {
diff --git a/portfwd.go b/portfwd.go
index 301308f6e21c8535915fab21b47e2b2650fde3a4..03a5c7bc144106400f5a667f2afe2bcfaf5df2cc 100644
--- a/portfwd.go
+++ b/portfwd.go
@@ -5,7 +5,6 @@ 	"log"
 	"time"
 
 	flog "github.com/anacrolix/log"
-
 	"github.com/elgatito/upnp"
 )
 
diff --git a/socket.go b/socket.go
index 716b0c622b9f2dd62992c34d7b11f98d81c9e955..adeef594f049031fb5e25126c5bea7707eb69d10 100644
--- a/socket.go
+++ b/socket.go
@@ -8,10 +8,9 @@ 	"net/url"
 	"strconv"
 	"strings"
 
-	"golang.org/x/net/proxy"
-
 	"github.com/anacrolix/missinggo"
 	"github.com/anacrolix/missinggo/perf"
+	"golang.org/x/net/proxy"
 )
 
 type dialer interface {