diff --git a/client/methods/helpers.go b/client/methods/helpers.go
index 67a229cd522b47add2ac28ad6bc605bef9861f24..e0e4304ded377a81893d166b73e9e59d37b1ab09 100644
--- a/client/methods/helpers.go
+++ b/client/methods/helpers.go
@@ -20,7 +20,6 @@ import (
 	"github.com/monax/burrow/definitions"
 	"github.com/monax/burrow/logging"
 	"github.com/monax/burrow/logging/lifecycle"
-	"github.com/monax/burrow/logging/loggers"
 	logging_types "github.com/monax/burrow/logging/types"
 )
 
diff --git a/client/websocket_client.go b/client/websocket_client.go
index 157aef3de785a62387d3fbdfb9a121b3a7eab9cc..a4ef9016d0f902a89b685b155583f9b7bef326be 100644
--- a/client/websocket_client.go
+++ b/client/websocket_client.go
@@ -24,7 +24,6 @@ import (
 	"github.com/tendermint/go-wire"
 
 	"github.com/monax/burrow/logging"
-	"github.com/monax/burrow/logging/loggers"
 	ctypes "github.com/monax/burrow/rpc/tendermint/core/types"
 	"github.com/monax/burrow/txs"
 )
diff --git a/config/config.go b/config/config.go
index 225a007de086a1acfe4def9c2562d72c2e240e8e..4afd56c97dccc57a661582c8063e92e0abb2121d 100644
--- a/config/config.go
+++ b/config/config.go
@@ -17,8 +17,9 @@ package config
 import (
 	"bytes"
 	"fmt"
-	lconfig "github.com/monax/burrow/logging/config"
 	"text/template"
+
+	lconfig "github.com/monax/burrow/logging/config"
 )
 
 type ConfigServiceGeneral struct {
diff --git a/logging/lifecycle/lifecycle.go b/logging/lifecycle/lifecycle.go
index c71f0667e5486f9af8dba70160e10bd8fdf78e6f..ede5b86b8a88dedaa9cda521adab1d3fe80b6877 100644
--- a/logging/lifecycle/lifecycle.go
+++ b/logging/lifecycle/lifecycle.go
@@ -23,6 +23,7 @@ import (
 	"github.com/monax/burrow/logging"
 	"github.com/monax/burrow/logging/adapters/stdlib"
 	tmLog15adapter "github.com/monax/burrow/logging/adapters/tendermint_log15"
+	"github.com/monax/burrow/logging/config"
 	"github.com/monax/burrow/logging/loggers"
 	"github.com/monax/burrow/logging/structure"
 
diff --git a/logging/loggers/channel_logger_test.go b/logging/loggers/channel_logger_test.go
index 5c1dc4c7658ea14387bbcaad921d86e876d6851e..0badbde119f5365180637a7355ffe7e47b7ceab9 100644
--- a/logging/loggers/channel_logger_test.go
+++ b/logging/loggers/channel_logger_test.go
@@ -17,9 +17,10 @@ package loggers
 import (
 	"testing"
 
+	"time"
+
 	"github.com/eapache/channels"
 	"github.com/stretchr/testify/assert"
-	"time"
 )
 
 func TestChannelLogger(t *testing.T) {
diff --git a/logging/loggers/filter_logger_test.go b/logging/loggers/filter_logger_test.go
index e8ef357704c79a45ca46bde278fa0fe80e0ff49c..da298026b304415a26aaf2fb8a71949adfe90ced 100644
--- a/logging/loggers/filter_logger_test.go
+++ b/logging/loggers/filter_logger_test.go
@@ -1,9 +1,10 @@
 package loggers
 
 import (
+	"testing"
+
 	. "github.com/monax/burrow/util/slice"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestFilterLogger(t *testing.T) {
diff --git a/manager/burrow-mint/evm/vm.go b/manager/burrow-mint/evm/vm.go
index cc1bce4ce4d54b55a2b579f0cb12289586d2be2c..c8af87b391b7f73c9e66f2e942b66779a8bd8466 100644
--- a/manager/burrow-mint/evm/vm.go
+++ b/manager/burrow-mint/evm/vm.go
@@ -27,6 +27,7 @@ import (
 	ptypes "github.com/monax/burrow/permission/types"
 	"github.com/monax/burrow/txs"
 	. "github.com/monax/burrow/word256"
+	"github.com/monax/cli/log"
 
 	"github.com/tendermint/go-events"
 )
diff --git a/manager/manager.go b/manager/manager.go
index 092b676ed570eeb5931868c439c4a6d11185c19e..c8baf8909f4cef2a9016876af43a0c2729b9678e 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -21,7 +21,6 @@ import (
 
 	config "github.com/monax/burrow/config"
 	definitions "github.com/monax/burrow/definitions"
-	"github.com/monax/burrow/logging/types"
 	burrowmint "github.com/monax/burrow/manager/burrow-mint"
 
 	"github.com/monax/burrow/logging"
diff --git a/rpc/tendermint/test/rpc_client_test.go b/rpc/tendermint/test/rpc_client_test.go
index 7f44a39e7982d6d9210671bbbe54abada02cbb26..beceb5484eaf466cd23673f9a4feac19222d59cc 100644
--- a/rpc/tendermint/test/rpc_client_test.go
+++ b/rpc/tendermint/test/rpc_client_test.go
@@ -20,10 +20,11 @@ package test
 import (
 	"bytes"
 	"fmt"
-	"golang.org/x/crypto/ripemd160"
 	"testing"
 	"time"
 
+	"golang.org/x/crypto/ripemd160"
+
 	consensus_types "github.com/monax/burrow/consensus/types"
 	edbcli "github.com/monax/burrow/rpc/tendermint/client"
 	"github.com/monax/burrow/txs"
diff --git a/util/snatives/templates/solidity_templates_test.go b/util/snatives/templates/solidity_templates_test.go
index 82f73237ae8e6ba85d62a269970fb2890e9076f5..1e77518707a3b0d1dc01f03c59c6200d2241cb0a 100644
--- a/util/snatives/templates/solidity_templates_test.go
+++ b/util/snatives/templates/solidity_templates_test.go
@@ -16,9 +16,10 @@ package templates
 
 import (
 	"fmt"
+	"testing"
+
 	"github.com/monax/burrow/manager/burrow-mint/evm"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestSNativeFuncTemplate(t *testing.T) {