diff --git a/client/client.go b/client/client.go
index 8ea29593..cdeb4db0 100644
--- a/client/client.go
+++ b/client/client.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"sync"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 type Client interface {
diff --git a/client/grpc_client.go b/client/grpc_client.go
index 566ee183..1a0e11d2 100644
--- a/client/grpc_client.go
+++ b/client/grpc_client.go
@@ -8,8 +8,8 @@ import (
 	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 // A stripped copy of the remoteClient that makes
diff --git a/client/local_client.go b/client/local_client.go
index b787eb36..33dd619b 100644
--- a/client/local_client.go
+++ b/client/local_client.go
@@ -3,8 +3,8 @@ package abcicli
 import (
 	"sync"
 
-	. "github.com/tendermint/go-common"
 	types "github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 type localClient struct {
diff --git a/client/socket_client.go b/client/socket_client.go
index 9b4f9aed..744b6c0c 100644
--- a/client/socket_client.go
+++ b/client/socket_client.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 const (
diff --git a/cmd/counter/main.go b/cmd/counter/main.go
index 218224a0..0714380b 100644
--- a/cmd/counter/main.go
+++ b/cmd/counter/main.go
@@ -3,9 +3,9 @@ package main
 import (
 	"flag"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/example/counter"
 	"github.com/tendermint/abci/server"
+	. "github.com/tendermint/go-common"
 )
 
 func main() {
diff --git a/cmd/dummy/main.go b/cmd/dummy/main.go
index aecb1138..8167c354 100644
--- a/cmd/dummy/main.go
+++ b/cmd/dummy/main.go
@@ -3,10 +3,10 @@ package main
 import (
 	"flag"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/example/dummy"
 	"github.com/tendermint/abci/server"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 func main() {
diff --git a/example/chain_aware/chain_aware_app.go b/example/chain_aware/chain_aware_app.go
index e3543f13..85ea7129 100644
--- a/example/chain_aware/chain_aware_app.go
+++ b/example/chain_aware/chain_aware_app.go
@@ -3,9 +3,9 @@ package main
 import (
 	"flag"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/server"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 func main() {
diff --git a/example/chain_aware/chain_aware_test.go b/example/chain_aware/chain_aware_test.go
index f5283a38..942c9ba9 100644
--- a/example/chain_aware/chain_aware_test.go
+++ b/example/chain_aware/chain_aware_test.go
@@ -5,10 +5,10 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/client"
 	"github.com/tendermint/abci/server"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 func TestChainAware(t *testing.T) {
diff --git a/example/counter/counter.go b/example/counter/counter.go
index 90be6d92..1249f667 100644
--- a/example/counter/counter.go
+++ b/example/counter/counter.go
@@ -3,8 +3,8 @@ package counter
 import (
 	"encoding/binary"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 type CounterApplication struct {
diff --git a/example/dummy/dummy_test.go b/example/dummy/dummy_test.go
index d2294347..f745d2ea 100644
--- a/example/dummy/dummy_test.go
+++ b/example/dummy/dummy_test.go
@@ -6,10 +6,10 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/tendermint/abci/types"
 	. "github.com/tendermint/go-common"
 	"github.com/tendermint/go-crypto"
 	"github.com/tendermint/go-wire"
-	"github.com/tendermint/abci/types"
 )
 
 func testDummy(t *testing.T, dummy types.Application, tx []byte, key, value string) {
diff --git a/example/dummy/persistent_dummy.go b/example/dummy/persistent_dummy.go
index fa730bcb..550c5969 100644
--- a/example/dummy/persistent_dummy.go
+++ b/example/dummy/persistent_dummy.go
@@ -6,11 +6,11 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/tendermint/abci/types"
 	. "github.com/tendermint/go-common"
 	dbm "github.com/tendermint/go-db"
 	"github.com/tendermint/go-merkle"
 	"github.com/tendermint/go-wire"
-	"github.com/tendermint/abci/types"
 )
 
 const (
diff --git a/example/example_test.go b/example/example_test.go
index 1ddefddb..fb15f503 100644
--- a/example/example_test.go
+++ b/example/example_test.go
@@ -10,12 +10,12 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/client"
 	"github.com/tendermint/abci/example/dummy"
 	nilapp "github.com/tendermint/abci/example/nil"
 	"github.com/tendermint/abci/server"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 func TestDummy(t *testing.T) {
diff --git a/server/grpc_server.go b/server/grpc_server.go
index 1acd45a3..07704c32 100644
--- a/server/grpc_server.go
+++ b/server/grpc_server.go
@@ -6,8 +6,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 // var maxNumberConnections = 2
diff --git a/server/server.go b/server/server.go
index 49676747..6de8747b 100644
--- a/server/server.go
+++ b/server/server.go
@@ -3,8 +3,8 @@ package server
 import (
 	"fmt"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 func NewServer(protoAddr, transport string, app types.Application) (Service, error) {
diff --git a/server/socket_server.go b/server/socket_server.go
index bd26a18a..1ef47859 100644
--- a/server/socket_server.go
+++ b/server/socket_server.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"sync"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 // var maxNumberConnections = 2
diff --git a/tests/benchmarks/parallel/parallel.go b/tests/benchmarks/parallel/parallel.go
index 5960d529..51d9a636 100644
--- a/tests/benchmarks/parallel/parallel.go
+++ b/tests/benchmarks/parallel/parallel.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	//"encoding/hex"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 func main() {
diff --git a/tests/benchmarks/simple/simple.go b/tests/benchmarks/simple/simple.go
index fb536730..b1b71fb7 100644
--- a/tests/benchmarks/simple/simple.go
+++ b/tests/benchmarks/simple/simple.go
@@ -8,8 +8,8 @@ import (
 	"reflect"
 	//"encoding/hex"
 
-	. "github.com/tendermint/go-common"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
 )
 
 func main() {
diff --git a/tests/test_app/app.go b/tests/test_app/app.go
index 59d5b0e7..b84b9386 100644
--- a/tests/test_app/app.go
+++ b/tests/test_app/app.go
@@ -5,10 +5,10 @@ import (
 	"os"
 	"time"
 
-	. "github.com/tendermint/go-common"
-	"github.com/tendermint/go-process"
 	"github.com/tendermint/abci/client"
 	"github.com/tendermint/abci/types"
+	. "github.com/tendermint/go-common"
+	"github.com/tendermint/go-process"
 )
 
 //----------------------------------------
diff --git a/testutil/messages.go b/testutil/messages.go
index 1036e48e..0cdddb44 100644
--- a/testutil/messages.go
+++ b/testutil/messages.go
@@ -1,8 +1,8 @@
 package testutil
 
 import (
-	"github.com/tendermint/go-crypto"
 	"github.com/tendermint/abci/types"
+	"github.com/tendermint/go-crypto"
 )
 
 //----------------------------------------