diff --git a/consensus/tendermint/config.go b/consensus/tendermint/config.go
index 4d9fe841546feb6514d1db4e8883e98c1cd4e7e4..b8c89d241d175d442b1550b09619b852a37f7b2c 100644
--- a/consensus/tendermint/config.go
+++ b/consensus/tendermint/config.go
@@ -55,7 +55,6 @@ func GetTendermintConfig(loadedConfig *viper.Viper) *TendermintConfig {
 // Contract
 //
 
-
 func (tmintConfig *TendermintConfig) AssertTendermintDefaults(chainId, workDir,
 	dataDir, rootDir string) {
 
@@ -78,7 +77,7 @@ func (tmintConfig *TendermintConfig) AssertTendermintDefaults(chainId, workDir,
 	tmintConfig.SetDefault("rpc_laddr", "")
 	tmintConfig.SetDefault("prof_laddr", "")
 	tmintConfig.SetDefault("revision_file", path.Join(workDir, "revision"))
-	tmintConfig.SetDefault("cs_wal_dir", path.Join(dataDir,"cs.wal"))
+	tmintConfig.SetDefault("cs_wal_dir", path.Join(dataDir, "cs.wal"))
 	tmintConfig.SetDefault("cs_wal_light", false)
 	tmintConfig.SetDefault("filter_peers", false)
 
diff --git a/consensus/types/consensus_engine.go b/consensus/types/consensus_engine.go
index 78abe9251c7cd7b168c353f6ea12cbfe209e11cc..191bc6e4cbd771803d56d889b8bcc22508ba6386 100644
--- a/consensus/types/consensus_engine.go
+++ b/consensus/types/consensus_engine.go
@@ -17,9 +17,9 @@ package types
 import (
 	"github.com/eris-ltd/eris-db/event"
 	"github.com/eris-ltd/eris-db/txs"
+	abci_types "github.com/tendermint/abci/types"
 	"github.com/tendermint/go-crypto"
 	"github.com/tendermint/go-p2p"
-	abci_types "github.com/tendermint/abci/types"
 )
 
 type ConsensusEngine interface {
diff --git a/manager/eris-mint/eris-mint.go b/manager/eris-mint/eris-mint.go
index c0071df3bcc322f2067642ed67c19ec0f2099bc1..9ba18441832ecf6bce0b500ba99fca9bc41b3a40 100644
--- a/manager/eris-mint/eris-mint.go
+++ b/manager/eris-mint/eris-mint.go
@@ -20,9 +20,9 @@ import (
 	"sync"
 	"time"
 
+	abci "github.com/tendermint/abci/types"
 	tendermint_events "github.com/tendermint/go-events"
 	wire "github.com/tendermint/go-wire"
-	abci "github.com/tendermint/abci/types"
 
 	"github.com/eris-ltd/eris-db/logging"
 	"github.com/eris-ltd/eris-db/logging/loggers"
diff --git a/manager/eris-mint/evm/snative.go b/manager/eris-mint/evm/snative.go
index c03d2bcd7dfab9515ec798454ef53dc6b1206831..b30858109c1356304b1d46394969c4f82df2479c 100644
--- a/manager/eris-mint/evm/snative.go
+++ b/manager/eris-mint/evm/snative.go
@@ -190,8 +190,8 @@ func SNativeContracts() map[string]*SNativeContractDescription {
 		if _, ok := contractMap[contract.Name]; ok {
 			// If this happens we have a pseudo compile time error that will be caught
 			// on native.go init()
-			panic(fmt.Errorf("Duplicate contract with name %s defined. " +
-					"Contract names must be unique.", contract.Name))
+			panic(fmt.Errorf("Duplicate contract with name %s defined. "+
+				"Contract names must be unique.", contract.Name))
 		}
 		contractMap[contract.Name] = contract
 	}
diff --git a/manager/eris-mint/evm/snative_test.go b/manager/eris-mint/evm/snative_test.go
index da0572b4535b42f6be66607ba29b1ce2e5fa8121..a60b62e15678596380769eb8880681517782102f 100644
--- a/manager/eris-mint/evm/snative_test.go
+++ b/manager/eris-mint/evm/snative_test.go
@@ -20,12 +20,12 @@ import (
 
 	"strings"
 
+	"github.com/eris-ltd/eris-db/manager/eris-mint/evm/abi"
 	. "github.com/eris-ltd/eris-db/manager/eris-mint/evm/opcodes"
 	"github.com/eris-ltd/eris-db/manager/eris-mint/evm/sha3"
 	ptypes "github.com/eris-ltd/eris-db/permission/types"
 	. "github.com/eris-ltd/eris-db/word256"
 	"github.com/stretchr/testify/assert"
-	"github.com/eris-ltd/eris-db/manager/eris-mint/evm/abi"
 )
 
 // Compiling the Permissions solidity contract at
diff --git a/rpc/tendermint/core/types/responses.go b/rpc/tendermint/core/types/responses.go
index f5f7c8a30dc84e741ee845d8f76ad082e03c1b0a..220ace4b49328834bd4393453f3055f03aed4880 100644
--- a/rpc/tendermint/core/types/responses.go
+++ b/rpc/tendermint/core/types/responses.go
@@ -22,11 +22,11 @@ import (
 	tendermint_types "github.com/tendermint/tendermint/types"
 
 	consensus_types "github.com/eris-ltd/eris-db/consensus/types"
+	abcitypes "github.com/tendermint/abci/types"
 	"github.com/tendermint/go-crypto"
 	"github.com/tendermint/go-p2p"
 	"github.com/tendermint/go-rpc/types"
 	"github.com/tendermint/go-wire"
-	abcitypes "github.com/tendermint/abci/types"
 )
 
 type ResultGetStorage struct {
diff --git a/rpc/tendermint/test/common.go b/rpc/tendermint/test/common.go
index 3f3dc1992cdca650513ba99035cf468a736b84c9..8151401f60dfa76dc6108753db7069f4dbdcbf82 100644
--- a/rpc/tendermint/test/common.go
+++ b/rpc/tendermint/test/common.go
@@ -1,4 +1,3 @@
-
 // Space above here matters
 // Copyright 2017 Monax Industries Limited
 //
diff --git a/test/mock/pipe.go b/test/mock/pipe.go
index 51f9ce366b5d60e4d2b5bc9a5f4404fe5c9a6ae9..c3c1f33558a3f0139c32af2260755370c676cc80 100644
--- a/test/mock/pipe.go
+++ b/test/mock/pipe.go
@@ -29,10 +29,10 @@ import (
 	"github.com/eris-ltd/eris-db/txs"
 
 	"github.com/eris-ltd/eris-db/logging/loggers"
+	abci_types "github.com/tendermint/abci/types"
 	"github.com/tendermint/go-crypto"
 	"github.com/tendermint/go-p2p"
 	mintTypes "github.com/tendermint/tendermint/types"
-	abci_types "github.com/tendermint/abci/types"
 )
 
 // Base struct.