diff --git a/ipam/allocate.go b/ipam/allocate.go
index 130380e9..79fe45dc 100644
--- a/ipam/allocate.go
+++ b/ipam/allocate.go
@@ -2,6 +2,7 @@ package ipam
 
 import (
 	"fmt"
+
 	"github.com/weaveworks/weave/ipam/address"
 )
 
diff --git a/ipam/paxos/paxos.go b/ipam/paxos/paxos.go
index a69b91da..61fda181 100644
--- a/ipam/paxos/paxos.go
+++ b/ipam/paxos/paxos.go
@@ -2,6 +2,7 @@ package paxos
 
 import (
 	"fmt"
+
 	"github.com/weaveworks/weave/router"
 )
 
diff --git a/ipam/paxos/paxos_test.go b/ipam/paxos/paxos_test.go
index cd704c5c..c1d5bfe0 100644
--- a/ipam/paxos/paxos_test.go
+++ b/ipam/paxos/paxos_test.go
@@ -2,10 +2,11 @@ package paxos
 
 import (
 	"fmt"
-	"github.com/weaveworks/weave/router"
 	"math/rand"
 	"testing"
 	"time"
+
+	"github.com/weaveworks/weave/router"
 )
 
 type TestNode struct {
diff --git a/ipam/space/space_test.go b/ipam/space/space_test.go
index 46a135c5..428349b5 100644
--- a/ipam/space/space_test.go
+++ b/ipam/space/space_test.go
@@ -188,7 +188,7 @@ func TestSpaceFree(t *testing.T) {
 	r = space.biggestFreeRange(entireRange)
 	wt.AssertTrue(t, r.Start == ip("10.0.3.10") && r.Size() == 4, "Wrong space")
 
-	wt.AssertEquals(t, space.OwnedRanges(), []address.Range{address.Range{Start: ip("10.0.3.4"), End: ip("10.0.3.24")}})
+	wt.AssertEquals(t, space.OwnedRanges(), []address.Range{{Start: ip("10.0.3.4"), End: ip("10.0.3.24")}})
 }
 
 func TestDonateSimple(t *testing.T) {
diff --git a/router/crypto.go b/router/crypto.go
index 19b0bcfa..291603d1 100644
--- a/router/crypto.go
+++ b/router/crypto.go
@@ -1,15 +1,16 @@
 package router
 
 import (
-	"code.google.com/p/go-bit/bit"
-	"code.google.com/p/go.crypto/nacl/box"
-	"code.google.com/p/go.crypto/nacl/secretbox"
 	"crypto/rand"
 	"crypto/sha256"
 	"encoding/binary"
 	"encoding/gob"
 	"fmt"
 	"sync"
+
+	"code.google.com/p/go-bit/bit"
+	"code.google.com/p/go.crypto/nacl/box"
+	"code.google.com/p/go.crypto/nacl/secretbox"
 )
 
 func GenerateKeyPair() (publicKey, privateKey *[32]byte, err error) {
diff --git a/router/ethernet_decoder.go b/router/ethernet_decoder.go
index 6588c0ad..297a2011 100644
--- a/router/ethernet_decoder.go
+++ b/router/ethernet_decoder.go
@@ -2,10 +2,11 @@ package router
 
 import (
 	"bytes"
-	"code.google.com/p/gopacket"
-	"code.google.com/p/gopacket/layers"
 	"log"
 	"net"
+
+	"code.google.com/p/gopacket"
+	"code.google.com/p/gopacket/layers"
 )
 
 type EthernetDecoder struct {
diff --git a/router/forwarder.go b/router/forwarder.go
index a4cec472..802369bd 100644
--- a/router/forwarder.go
+++ b/router/forwarder.go
@@ -1,10 +1,11 @@
 package router
 
 import (
-	"code.google.com/p/gopacket"
-	"code.google.com/p/gopacket/layers"
 	"syscall"
 	"time"
+
+	"code.google.com/p/gopacket"
+	"code.google.com/p/gopacket/layers"
 )
 
 type ForwardedFrame struct {
diff --git a/router/handshake_test.go b/router/handshake_test.go
index a72bf17c..1630d343 100644
--- a/router/handshake_test.go
+++ b/router/handshake_test.go
@@ -1,8 +1,9 @@
 package router
 
 import (
-	wt "github.com/weaveworks/weave/testing"
 	"testing"
+
+	wt "github.com/weaveworks/weave/testing"
 )
 
 func TestFieldValidator(t *testing.T) {
diff --git a/router/mocks_test.go b/router/mocks_test.go
index 674eaa3a..dc0ec6c3 100644
--- a/router/mocks_test.go
+++ b/router/mocks_test.go
@@ -6,8 +6,9 @@
 package router
 
 import (
-	wt "github.com/weaveworks/weave/testing"
 	"testing"
+
+	wt "github.com/weaveworks/weave/testing"
 )
 
 // Add to peers a connection from peers.ourself to p
diff --git a/router/pcap.go b/router/pcap.go
index 761d4e1d..07d8b1d9 100644
--- a/router/pcap.go
+++ b/router/pcap.go
@@ -1,8 +1,9 @@
 package router
 
 import (
-	"code.google.com/p/gopacket/pcap"
 	"fmt"
+
+	"code.google.com/p/gopacket/pcap"
 )
 
 type PcapIO struct {
diff --git a/router/peers_test.go b/router/peers_test.go
index daf1e944..bf221642 100644
--- a/router/peers_test.go
+++ b/router/peers_test.go
@@ -2,9 +2,10 @@ package router
 
 import (
 	"fmt"
-	wt "github.com/weaveworks/weave/testing"
 	"math/rand"
 	"testing"
+
+	wt "github.com/weaveworks/weave/testing"
 )
 
 // TODO we should also test:
diff --git a/router/udp_sender.go b/router/udp_sender.go
index 9e91ee0b..4c264762 100644
--- a/router/udp_sender.go
+++ b/router/udp_sender.go
@@ -1,11 +1,12 @@
 package router
 
 import (
-	"code.google.com/p/gopacket"
-	"code.google.com/p/gopacket/layers"
 	"log"
 	"net"
 	"syscall"
+
+	"code.google.com/p/gopacket"
+	"code.google.com/p/gopacket/layers"
 )
 
 type UDPSender interface {