diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index c8c178229..0d9356960 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -554,7 +554,6 @@ func getState(app *BaseApp, mode runTxMode) *state {
 
 // txBytes may be nil in some cases, eg. in tests.
 // Also, in the future we may support "internal" transactions.
-// nolint: gocyclo
 func (app *BaseApp) runTx(mode runTxMode, txBytes []byte, tx sdk.Tx) (result sdk.Result) {
 	//NOTE: GasWanted should be returned by the AnteHandler.
 	// GasUsed is determined by the GasMeter.
diff --git a/x/mock/app_test.go b/x/mock/app_test.go
index 0890b53ec..0c548280a 100644
--- a/x/mock/app_test.go
+++ b/x/mock/app_test.go
@@ -27,7 +27,7 @@ func (tx testMsg) Type() string                       { return msgType }
 func (tx testMsg) GetMsg() sdk.Msg                    { return tx }
 func (tx testMsg) GetMemo() string                    { return "" }
 func (tx testMsg) GetSignBytes() []byte               { return nil }
-func (tx testMsg) GetSigners() []sdk.AccAddress          { return tx.signers }
+func (tx testMsg) GetSigners() []sdk.AccAddress       { return tx.signers }
 func (tx testMsg) GetSignatures() []auth.StdSignature { return nil }
 func (tx testMsg) ValidateBasic() sdk.Error {
 	if tx.positiveNum >= 0 {
diff --git a/x/stake/app_test.go b/x/stake/app_test.go
index aa25138c9..6d6da617e 100644
--- a/x/stake/app_test.go
+++ b/x/stake/app_test.go
@@ -83,7 +83,6 @@ func checkValidator(t *testing.T, mapp *mock.App, keeper Keeper,
 	return validator
 }
 
-
 func checkDelegation(
 	t *testing.T, mapp *mock.App, keeper Keeper, delegatorAddr,
 	validatorAddr sdk.AccAddress, expFound bool, expShares sdk.Rat,
diff --git a/x/stake/keeper/key.go b/x/stake/keeper/key.go
index 132add34a..ac7fe6e5f 100644
--- a/x/stake/keeper/key.go
+++ b/x/stake/keeper/key.go
@@ -156,7 +156,7 @@ func GetUBDsByValIndexKey(validatorAddr sdk.AccAddress) []byte {
 
 // get the key for a redelegation
 // VALUE: stake/types.RedelegationKey
-func GetREDKey(delegatorAddr, validatorSrcAddr,	validatorDstAddr sdk.AccAddress) []byte {
+func GetREDKey(delegatorAddr, validatorSrcAddr, validatorDstAddr sdk.AccAddress) []byte {
 	return append(append(
 		GetREDsKey(delegatorAddr.Bytes()),
 		validatorSrcAddr.Bytes()...),