diff --git a/client/lcd/root.go b/client/lcd/root.go
index 75cf3632eac8..f05fb8808198 100644
--- a/client/lcd/root.go
+++ b/client/lcd/root.go
@@ -19,12 +19,12 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"github.com/tendermint/tendermint/libs/cli"
 	cmn "github.com/tendermint/tendermint/libs/common"
 	"github.com/tendermint/tendermint/libs/log"
-	tmserver "github.com/tendermint/tendermint/rpc/lib/server"
-	tendermintLiteProxy "github.com/tendermint/tendermint/lite/proxy"
-	"github.com/tendermint/tendermint/libs/cli"
 	tendermintLite "github.com/tendermint/tendermint/lite"
+	tendermintLiteProxy "github.com/tendermint/tendermint/lite/proxy"
+	tmserver "github.com/tendermint/tendermint/rpc/lib/server"
 )
 
 // ServeCommand will generate a long-running rest server
@@ -88,7 +88,7 @@ func createHandler(cdc *wire.Codec) http.Handler {
 	home := viper.GetString(cli.HomeFlag)
 	nodeURI := viper.GetString(client.FlagNode)
 	var certifier tendermintLite.Certifier
-	if chainID != "" && home != "" && nodeURI != ""{
+	if chainID != "" && home != "" && nodeURI != "" {
 		certifier, err = tendermintLiteProxy.GetCertifier(chainID, home, nodeURI)
 		if err != nil {
 			panic(err)
diff --git a/server/export_test.go b/server/export_test.go
index 358f72cf60fe..488c55bbf654 100644
--- a/server/export_test.go
+++ b/server/export_test.go
@@ -1,16 +1,16 @@
 package server
 
 import (
-	"testing"
-	"github.com/stretchr/testify/require"
+	"bytes"
+	"github.com/cosmos/cosmos-sdk/server/mock"
 	"github.com/cosmos/cosmos-sdk/wire"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/stretchr/testify/require"
 	tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
-	"os"
-	"bytes"
+	"github.com/tendermint/tendermint/libs/log"
 	"io"
-		"github.com/cosmos/cosmos-sdk/server/mock"
-	)
+	"os"
+	"testing"
+)
 
 func TestEmptyState(t *testing.T) {
 	defer setupViper(t)()
diff --git a/server/mock/app.go b/server/mock/app.go
index eb2dfc3cc300..3c6ad3ec2798 100644
--- a/server/mock/app.go
+++ b/server/mock/app.go
@@ -129,7 +129,7 @@ func AppGenStateEmpty(_ *wire.Codec, _ []json.RawMessage) (appState json.RawMess
 
 // Return a validator, not much else
 func AppGenTx(_ *wire.Codec, pk crypto.PubKey, genTxConfig gc.GenTx) (
-		appGenTx, cliPrint json.RawMessage, validator tmtypes.GenesisValidator, err error) {
+	appGenTx, cliPrint json.RawMessage, validator tmtypes.GenesisValidator, err error) {
 
 	validator = tmtypes.GenesisValidator{
 		PubKey: pk,