diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index 3eebb1eb4..827408b20 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -114,7 +114,6 @@ func (app *BaseApp) SetEndBlocker(endBlocker sdk.EndBlocker) {
 func (app *BaseApp) SetAnteHandler(ah sdk.AnteHandler) {
 	app.anteHandler = ah
 }
-
 func (app *BaseApp) Router() Router { return app.router }
 
 // load latest application version
@@ -337,7 +336,7 @@ func (app *BaseApp) DeliverTx(txBytes []byte) (res abci.ResponseDeliverTx) {
 	}
 }
 
-// Mostly for testing
+// nolint- Mostly for testing
 func (app *BaseApp) Check(tx sdk.Tx) (result sdk.Result) {
 	return app.runTx(true, nil, tx)
 }
diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go
index 78fd50464..f70521009 100644
--- a/baseapp/baseapp_test.go
+++ b/baseapp/baseapp_test.go
@@ -240,7 +240,7 @@ func TestDeliverTx(t *testing.T) {
 		height := int64((counter / txPerHeight) + 1)
 		assert.Equal(t, height, thisHeader.Height)
 
-		counter += 1
+		counter++
 		return sdk.Result{}
 	})
 
diff --git a/client/core/core.go b/client/context/helpers.go
similarity index 95%
rename from client/core/core.go
rename to client/context/helpers.go
index 2a1b2736a..509ec09dc 100644
--- a/client/core/core.go
+++ b/client/context/helpers.go
@@ -1,4 +1,4 @@
-package core
+package context
 
 import (
 	"fmt"
@@ -141,17 +141,17 @@ func (ctx CoreContext) SignBuildBroadcast(name string, msg sdk.Msg, cdc *wire.Co
 }
 
 // get the next sequence for the account address
-func (c CoreContext) NextSequence(address []byte) (int64, error) {
-	if c.Decoder == nil {
+func (ctx CoreContext) NextSequence(address []byte) (int64, error) {
+	if ctx.Decoder == nil {
 		return 0, errors.New("AccountDecoder required but not provided")
 	}
 
-	res, err := c.Query(address, c.AccountStore)
+	res, err := ctx.Query(address, ctx.AccountStore)
 	if err != nil {
 		return 0, err
 	}
 
-	account, err := c.Decoder(res)
+	account, err := ctx.Decoder(res)
 	if err != nil {
 		panic(err)
 	}
diff --git a/client/core/context.go b/client/context/types.go
similarity index 96%
rename from client/core/context.go
rename to client/context/types.go
index fac60b553..e580027d6 100644
--- a/client/core/context.go
+++ b/client/context/types.go
@@ -1,4 +1,4 @@
-package core
+package context
 
 import (
 	rpcclient "github.com/tendermint/tendermint/rpc/client"
@@ -6,6 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
+// typical context created in sdk modules for transactions/queries
 type CoreContext struct {
 	ChainID         string
 	Height          int64
diff --git a/client/context/viper.go b/client/context/viper.go
index c3b0369d9..7e82f7ad9 100644
--- a/client/context/viper.go
+++ b/client/context/viper.go
@@ -2,6 +2,7 @@ package context
 
 import (
 	"fmt"
+
 	"github.com/spf13/viper"
 
 	tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
@@ -9,11 +10,10 @@ import (
 	tmtypes "github.com/tendermint/tendermint/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/core"
 )
 
 // NewCoreContextFromViper - return a new context with parameters from the command line
-func NewCoreContextFromViper() core.CoreContext {
+func NewCoreContextFromViper() CoreContext {
 	nodeURI := viper.GetString(client.FlagNode)
 	var rpc rpcclient.Client
 	if nodeURI != "" {
@@ -27,7 +27,7 @@ func NewCoreContextFromViper() core.CoreContext {
 			chainID = def
 		}
 	}
-	return core.CoreContext{
+	return CoreContext{
 		ChainID:         chainID,
 		Height:          viper.GetInt64(client.FlagHeight),
 		TrustNode:       viper.GetBool(client.FlagTrustNode),
@@ -54,7 +54,7 @@ func defaultChainID() (string, error) {
 }
 
 // EnsureSequence - automatically set sequence number if none provided
-func EnsureSequence(ctx core.CoreContext) (core.CoreContext, error) {
+func EnsureSequence(ctx CoreContext) (CoreContext, error) {
 	if viper.IsSet(client.FlagSequence) {
 		return ctx, nil
 	}
diff --git a/client/lcd/helpers.go b/client/lcd/helpers.go
index 64814a5fc..a64d44dfa 100644
--- a/client/lcd/helpers.go
+++ b/client/lcd/helpers.go
@@ -28,10 +28,9 @@ func waitForRPC() {
 		_, err := client.Call("status", map[string]interface{}{}, result)
 		if err == nil {
 			return
-		} else {
-			fmt.Println("error", err)
-			time.Sleep(time.Millisecond)
 		}
+		fmt.Println("error", err)
+		time.Sleep(time.Millisecond)
 	}
 }
 
diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go
index e84ff8e9b..0b5c6b064 100644
--- a/client/lcd/lcd_test.go
+++ b/client/lcd/lcd_test.go
@@ -42,9 +42,9 @@ var (
 	coinAmount = int64(10000000)
 
 	// XXX bad globals
+	name     = "test"
+	password = "0123456789"
 	port     string // XXX: but it's the int ...
-	name     string = "test"
-	password string = "0123456789"
 	seed     string
 	sendAddr string
 )