cmd/scrape/main.go     |  1 -
 cmd/torrent/main.go    |  3 +--
 cmd/torrentfs/main.go  |  5 +++--
 download_strategies.go |  3 ++-
 fs/torrentfs.go        |  8 +++++---
 misc.go                |  9 +++++----
 torrent.go             | 13 ++++++++-----

diff --git a/cmd/scrape/main.go b/cmd/scrape/main.go
index 826aacf7ee5795fc35a6f4f732bfa31d120677a4..f8a35ef1892cf488ef52d2e9f483905c4df01e11 100644
--- a/cmd/scrape/main.go
+++ b/cmd/scrape/main.go
@@ -5,7 +5,6 @@ 	"flag"
 	"log"
 	"os"
 
-	"bitbucket.org/anacrolix/go.torrent"
 	"bitbucket.org/anacrolix/go.torrent/tracker"
 	_ "bitbucket.org/anacrolix/go.torrent/tracker/udp"
 	"bitbucket.org/anacrolix/go.torrent/util"
diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go
index 20443b7b74661f553ea6f57f93211f3954317407..294923360d9a3749b02ce0cfac326225bdeb81c1 100644
--- a/cmd/torrent/main.go
+++ b/cmd/torrent/main.go
@@ -10,11 +10,10 @@ 	_ "net/http/pprof"
 	"os"
 	"strings"
 
-	"bitbucket.org/anacrolix/go.torrent/util"
-
 	"github.com/anacrolix/libtorgo/metainfo"
 
 	"bitbucket.org/anacrolix/go.torrent"
+	"bitbucket.org/anacrolix/go.torrent/util"
 )
 
 var (
diff --git a/cmd/torrentfs/main.go b/cmd/torrentfs/main.go
index 34cdbf8a7dddbf0145c829aa000bf495dc2a5863..63ec59dfbbe939213da4a2eabca8c0f224c9301e 100644
--- a/cmd/torrentfs/main.go
+++ b/cmd/torrentfs/main.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"bitbucket.org/anacrolix/go.torrent/util"
-	"bitbucket.org/anacrolix/go.torrent/util/dirwatch"
 	"flag"
 	"log"
 	"net"
@@ -14,6 +12,9 @@ 	"os/user"
 	"path/filepath"
 	"syscall"
 	"time"
+
+	"bitbucket.org/anacrolix/go.torrent/util"
+	"bitbucket.org/anacrolix/go.torrent/util/dirwatch"
 
 	"bazil.org/fuse"
 	fusefs "bazil.org/fuse/fs"
diff --git a/download_strategies.go b/download_strategies.go
index cd42ecbd175b682fbcc8551a52331985e36ee54d..8ffa61fdac5e6b065ddef023231c6fc9999a2d70 100644
--- a/download_strategies.go
+++ b/download_strategies.go
@@ -1,8 +1,9 @@
 package torrent
 
 import (
+	"container/list"
+
 	pp "bitbucket.org/anacrolix/go.torrent/peer_protocol"
-	"container/list"
 )
 
 type DownloadStrategy interface {
diff --git a/fs/torrentfs.go b/fs/torrentfs.go
index d1c6732ceb212286cb1299910ff93aaa2c65487b..5f345561462b486b5bc770a0c130133db24b321a 100644
--- a/fs/torrentfs.go
+++ b/fs/torrentfs.go
@@ -1,13 +1,15 @@
 package torrentfs
 
 import (
+	"log"
+	"os"
+	"strings"
+	"sync"
+
 	"bazil.org/fuse"
 	fusefs "bazil.org/fuse/fs"
 	"bitbucket.org/anacrolix/go.torrent"
 	"github.com/anacrolix/libtorgo/metainfo"
-	"log"
-	"os"
-	"sync"
 )
 
 const (
diff --git a/misc.go b/misc.go
index b2232f1d015db766f8b8d56366a3e77e9f81aa02..784ecf4d8a018a30f742ecf830ce14081f3a88ea 100644
--- a/misc.go
+++ b/misc.go
@@ -1,16 +1,17 @@
 package torrent
 
 import (
-	"bitbucket.org/anacrolix/go.torrent/mmap_span"
-	"bitbucket.org/anacrolix/go.torrent/peer_protocol"
 	"crypto"
 	"errors"
-	"github.com/anacrolix/libtorgo/metainfo"
-	"launchpad.net/gommap"
 	"math/rand"
 	"os"
 	"path/filepath"
 	"time"
+
+	"bitbucket.org/anacrolix/go.torrent/mmap_span"
+	"bitbucket.org/anacrolix/go.torrent/peer_protocol"
+	"github.com/anacrolix/libtorgo/metainfo"
+	"launchpad.net/gommap"
 )
 
 const (
diff --git a/torrent.go b/torrent.go
index dd99fb0ac64888be29b44178ff837ffaa52368ab..9b586cea1ecc2dc974dfe71b64cb4228ef943d4b 100644
--- a/torrent.go
+++ b/torrent.go
@@ -1,17 +1,20 @@
 package torrent
 
 import (
-	"bitbucket.org/anacrolix/go.torrent/mmap_span"
-	pp "bitbucket.org/anacrolix/go.torrent/peer_protocol"
-	"bitbucket.org/anacrolix/go.torrent/tracker"
 	"container/list"
 	"fmt"
-	"github.com/anacrolix/libtorgo/bencode"
-	"github.com/anacrolix/libtorgo/metainfo"
 	"io"
 	"log"
 	"net"
 	"sync"
+
+	"bitbucket.org/anacrolix/go.torrent/util"
+
+	"bitbucket.org/anacrolix/go.torrent/mmap_span"
+	pp "bitbucket.org/anacrolix/go.torrent/peer_protocol"
+	"bitbucket.org/anacrolix/go.torrent/tracker"
+	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/libtorgo/metainfo"
 )
 
 func (t *torrent) PieceNumPendingBytes(index pp.Integer) (count pp.Integer) {