diff --git a/cmd/serve.go b/cmd/serve.go
index 0ff79db195d4b81dda63f8b0bc648e36ff838bbe..89666e830e2483dc8594e11cec1e69b5b72c0e8c 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -28,8 +28,8 @@ import (
 	vm "github.com/hyperledger/burrow/manager/burrow-mint/evm"
 	"github.com/hyperledger/burrow/util"
 
-	"github.com/spf13/cobra"
 	"github.com/hyperledger/burrow/config"
+	"github.com/spf13/cobra"
 )
 
 const (
diff --git a/consensus/tendermint/tendermint.go b/consensus/tendermint/tendermint.go
index 0578ea40c445dfe699189f522686c6a1e2e7d81f..4f793389e5ae4a1e56d3e714a85482cd3beba3c6 100644
--- a/consensus/tendermint/tendermint.go
+++ b/consensus/tendermint/tendermint.go
@@ -19,6 +19,7 @@ import (
 	"path"
 	"strings"
 
+	tendermint_version "github.com/hyperledger/burrow/consensus/tendermint/version"
 	abci_types "github.com/tendermint/abci/types"
 	crypto "github.com/tendermint/go-crypto"
 	p2p "github.com/tendermint/go-p2p"
@@ -26,7 +27,6 @@ import (
 	node "github.com/tendermint/tendermint/node"
 	proxy "github.com/tendermint/tendermint/proxy"
 	tendermint_types "github.com/tendermint/tendermint/types"
-	tendermint_version "github.com/hyperledger/burrow/consensus/tendermint/version"
 
 	edb_event "github.com/hyperledger/burrow/event"
 
diff --git a/core/config.go b/core/config.go
index b4b4e461e30ef33684bee4bb33af408a8cad3436..1b9b79dbca5b14af924f1645ea149c5194e0b1a2 100644
--- a/core/config.go
+++ b/core/config.go
@@ -24,14 +24,14 @@ import (
 	"path"
 
 	"github.com/hyperledger/burrow/config"
+	"github.com/hyperledger/burrow/consensus"
 	"github.com/hyperledger/burrow/definitions"
 	lconfig "github.com/hyperledger/burrow/logging/config"
+	"github.com/hyperledger/burrow/manager"
 	"github.com/hyperledger/burrow/server"
 	"github.com/hyperledger/burrow/util"
-	"github.com/spf13/viper"
 	"github.com/hyperledger/burrow/version"
-	"github.com/hyperledger/burrow/manager"
-	"github.com/hyperledger/burrow/consensus"
+	"github.com/spf13/viper"
 )
 
 // LoadConsensusModuleConfig wraps specifically for the consensus module
diff --git a/genesis/maker.go b/genesis/maker.go
index e89a5e99ed06c38ecc3995fdad22c06d73ecb67b..bfabb4fbc3671a9f0d6f1157dc28339634ad0d4c 100644
--- a/genesis/maker.go
+++ b/genesis/maker.go
@@ -27,8 +27,6 @@ const (
 	PublicKeySecp256k1ByteLength int = 64
 )
 
-
-
 // NewGenesisAccount returns a new GenesisAccount
 func NewGenesisAccount(address []byte, amount int64, name string,
 	permissions *ptypes.AccountPermissions) *GenesisAccount {
diff --git a/manager/burrow-mint/burrow-mint.go b/manager/burrow-mint/burrow-mint.go
index 0bde0a0625d4498306f81d3178a98930968ef17a..d3255452a3585f2da307dce4b65226e6767a2231 100644
--- a/manager/burrow-mint/burrow-mint.go
+++ b/manager/burrow-mint/burrow-mint.go
@@ -214,4 +214,3 @@ func (app *BurrowMint) EndBlock(height uint64) (respEndblock abci.ResponseEndBlo
 	// events particularly if we want to separate ourselves from go-events
 	return
 }
-
diff --git a/manager/types/application.go b/manager/types/application.go
index 762b56c32602e87d53b2934848a89459e2e12221..2025742bbd5cee5b62b95f348478d382f0acab31 100644
--- a/manager/types/application.go
+++ b/manager/types/application.go
@@ -18,8 +18,8 @@ import (
 	// TODO: [ben] this is currently only used for abci result type; but should
 	// be removed as abci dependencies shouldn't feature in the application
 	// manager
-	abci "github.com/tendermint/abci/types"
 	consensus_types "github.com/hyperledger/burrow/consensus/types"
+	abci "github.com/tendermint/abci/types"
 )
 
 // NOTE: [ben] this interface is likely to be changed.  Currently it is taken
diff --git a/rpc/tendermint/test/rpc_client_test.go b/rpc/tendermint/test/rpc_client_test.go
index 6f9d9f0aa183c1521ba0e0843c55bd81dec9db86..3f7da59afb790e358e2d0dda423ae7e2291067cc 100644
--- a/rpc/tendermint/test/rpc_client_test.go
+++ b/rpc/tendermint/test/rpc_client_test.go
@@ -96,7 +96,7 @@ func TestGetAccount(t *testing.T) {
 		t.Skip("skipping test in short mode.")
 	}
 	testWithAllClients(t, func(t *testing.T, clientName string, client burrow_client.RPCClient) {
-		acc := getAccount(t,  client, users[0].Address)
+		acc := getAccount(t, client, users[0].Address)
 		if acc == nil {
 			t.Fatal("Account was nil")
 		}
diff --git a/rpc/tendermint/test/shared.go b/rpc/tendermint/test/shared.go
index f31d49503bae5b0b0fa2a650950fa452807967c1..5205e69368d4173a7122796ba396e16eab9a475c 100644
--- a/rpc/tendermint/test/shared.go
+++ b/rpc/tendermint/test/shared.go
@@ -173,12 +173,12 @@ func genesisFileBytesFromUsers(chainName string, accounts []*acm.PrivAccount) ([
 func genesisValidatorFromPrivAccount(account *acm.PrivAccount) *genesis.GenesisValidator {
 	return &genesis.GenesisValidator{
 		Amount: 1000000,
-		Name: fmt.Sprintf("full-account_%X", account.Address),
+		Name:   fmt.Sprintf("full-account_%X", account.Address),
 		PubKey: account.PubKey,
 		UnbondTo: []genesis.BasicAccount{
 			{
 				Address: account.Address,
-				Amount: 100,
+				Amount:  100,
 			},
 		},
 	}
diff --git a/rpc/v0/rest_server_test.go b/rpc/v0/rest_server_test.go
index b336d3f8e6fc873884a58bdbca76b76b0480b85c..757993201a2189172be193e72410bd4cfd5ee0e7 100644
--- a/rpc/v0/rest_server_test.go
+++ b/rpc/v0/rest_server_test.go
@@ -32,9 +32,9 @@ import (
 	"github.com/hyperledger/burrow/txs"
 
 	"github.com/gin-gonic/gin"
-	"github.com/hyperledger/burrow/rpc/v0/shared"
 	"github.com/hyperledger/burrow/logging/lifecycle"
 	logging_types "github.com/hyperledger/burrow/logging/types"
+	"github.com/hyperledger/burrow/rpc/v0/shared"
 	"github.com/stretchr/testify/suite"
 	"github.com/tendermint/log15"
 )
diff --git a/version/version.go b/version/version.go
index 61c6b31b35fa27f079100046be6199a5dbe21191..449d562b15c56cc51c36208032f031397628594d 100644
--- a/version/version.go
+++ b/version/version.go
@@ -58,9 +58,9 @@ type VersionIdentifier struct {
 func New(client string, major, minor, patch uint8) *VersionIdentifier {
 	return &VersionIdentifier{
 		ClientIdentifier: client,
-		MajorVersion: major,
-		MinorVersion: minor,
-		PatchVersion: patch,
+		MajorVersion:     major,
+		MinorVersion:     minor,
+		PatchVersion:     patch,
 	}
 }