diff --git a/client/rest/rest.go b/client/rest/rest.go
index ac05891e04c7..624af80140d1 100644
--- a/client/rest/rest.go
+++ b/client/rest/rest.go
@@ -25,6 +25,7 @@ func addHTTPDeprecationHeaders(h http.Handler) http.Handler {
 // WithHTTPDeprecationHeaders returns a new *mux.Router, identical to its input
 // but with the addition of HTTP Deprecation headers. This is used to mark legacy
 // amino REST endpoints as deprecated in the REST API.
+// nolint:gocritic
 func WithHTTPDeprecationHeaders(r *mux.Router) *mux.Router {
 	subRouter := r.NewRoute().Subrouter()
 	subRouter.Use(addHTTPDeprecationHeaders)
diff --git a/types/decimal.go b/types/decimal.go
index ec8514fd9ee1..5eef0e4f9d2e 100644
--- a/types/decimal.go
+++ b/types/decimal.go
@@ -80,7 +80,7 @@ func precisionMultiplier(prec int64) *big.Int {
 	return precisionMultipliers[prec]
 }
 
-// ______________________________________________________________________________________________
+// _____________________________________________________________________________________________
 
 // create a new Dec from integer assuming whole number
 func NewDec(i int64) Dec {
@@ -201,7 +201,9 @@ func MustNewDecFromStr(s string) Dec {
 	return dec
 }
 
-// ______________________________________________________________________________________________
+// _____________________________________________________________________________________________
+//nolint
+
 func (d Dec) IsNil() bool       { return d.i == nil }                 // is decimal nil
 func (d Dec) IsZero() bool      { return (d.i).Sign() == 0 }          // is equal to zero
 func (d Dec) IsNegative() bool  { return (d.i).Sign() == -1 }         // is negative
@@ -643,7 +645,7 @@ func (d Dec) RoundInt() Int {
 	return NewIntFromBigInt(chopPrecisionAndRoundNonMutative(d.i))
 }
 
-// ___________________________________________________________________________________
+// __________________________________________________________________________________
 
 // similar to chopPrecisionAndRound, but always rounds down
 func chopPrecisionAndTruncate(d *big.Int) *big.Int {
@@ -694,7 +696,7 @@ func (d Dec) Ceil() Dec {
 	return NewDecFromBigInt(quo.Add(quo, oneInt))
 }
 
-// ___________________________________________________________________________________
+// __________________________________________________________________________________
 
 // MaxSortableDec is the largest Dec that can be passed into SortableDecBytes()
 // Its negative form is the least Dec that can be passed in.
@@ -734,7 +736,7 @@ func SortableDecBytes(dec Dec) []byte {
 	return []byte(fmt.Sprintf(fmt.Sprintf("%%0%ds", Precision*2+1), dec.String()))
 }
 
-// ___________________________________________________________________________________
+// __________________________________________________________________________________
 
 // reuse nil values
 var nilJSON []byte
@@ -844,7 +846,7 @@ func (dp DecProto) String() string {
 	return dp.Dec.String()
 }
 
-// ___________________________________________________________________________________
+// __________________________________________________________________________________
 // helpers
 
 // test if two decimal arrays are equal
diff --git a/types/decimal_test.go b/types/decimal_test.go
index 0f77ce90a2b6..dda28c8d01f3 100644
--- a/types/decimal_test.go
+++ b/types/decimal_test.go
@@ -29,7 +29,7 @@ func (s *decimalTestSuite) mustNewDecFromStr(str string) (d sdk.Dec) {
 	return d
 }
 
-// _______________________________________
+// ______________________________________
 
 func (s *decimalTestSuite) TestNewDecFromStr() {
 	largeBigInt, success := new(big.Int).SetString("3144605511029693144278234343371835", 10)
diff --git a/types/module/module.go b/types/module/module.go
index 44fa33016ae8..5c047234d32e 100644
--- a/types/module/module.go
+++ b/types/module/module.go
@@ -42,7 +42,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-// __________________________________________________________________________________________
+// _________________________________________________________________________________________
 
 // AppModuleBasic is the standard form for basic non-dependant elements of an application module.
 type AppModuleBasic interface {
@@ -145,7 +145,7 @@ func (bm BasicManager) AddQueryCommands(rootQueryCmd *cobra.Command) {
 	}
 }
 
-// _________________________________________________________
+// ________________________________________________________
 
 // AppModuleGenesis is the standard form for an application module genesis functions
 type AppModuleGenesis interface {
@@ -179,7 +179,7 @@ type AppModule interface {
 	EndBlock(sdk.Context, abci.RequestEndBlock) []abci.ValidatorUpdate
 }
 
-// ___________________________
+// __________________________
 
 // GenesisOnlyAppModule is an AppModule that only has import/export functionality
 type GenesisOnlyAppModule struct {
@@ -216,7 +216,7 @@ func (GenesisOnlyAppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []ab
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // Manager defines a module manager that provides the high level utility for managing and executing
 // operations for a group of modules
diff --git a/types/simulation/types.go b/types/simulation/types.go
index 090978bf6e15..48ce0a4ea710 100644
--- a/types/simulation/types.go
+++ b/types/simulation/types.go
@@ -114,7 +114,7 @@ func (om OperationMsg) LogEvent(eventLogger func(route, op, evResult string)) {
 	eventLogger(om.Route, om.Name, pass)
 }
 
-// ________________________________________________________________________
+// _______________________________________________________________________
 
 // FutureOperation is an operation which will be ran at the beginning of the
 // provided BlockHeight. If both a BlockHeight and BlockTime are specified, it
diff --git a/types/uint.go b/types/uint.go
index a42c78395ed6..2560ef20a8a7 100644
--- a/types/uint.go
+++ b/types/uint.go
@@ -207,7 +207,7 @@ func (u *Uint) Size() int {
 func (u Uint) MarshalAmino() ([]byte, error)   { return u.Marshal() }
 func (u *Uint) UnmarshalAmino(bz []byte) error { return u.Unmarshal(bz) }
 
-// __________________________________________________________________________
+// _________________________________________________________________________
 
 // UintOverflow returns true if a given unsigned integer overflows and false
 // otherwise.
diff --git a/x/auth/module.go b/x/auth/module.go
index 8895a9f15ea5..a38e68966e09 100644
--- a/x/auth/module.go
+++ b/x/auth/module.go
@@ -85,7 +85,7 @@ func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry)
 	types.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the auth module.
 type AppModule struct {
@@ -156,7 +156,7 @@ func (AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Validato
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 
diff --git a/x/auth/vesting/types/vesting_account.go b/x/auth/vesting/types/vesting_account.go
index 8de50ffa7c19..8188a6b1ea8d 100644
--- a/x/auth/vesting/types/vesting_account.go
+++ b/x/auth/vesting/types/vesting_account.go
@@ -307,9 +307,9 @@ func (cva ContinuousVestingAccount) Validate() error {
 }
 
 // AddToOriginalVestedCoins adds more coins to an account that are subject to its initial vesting schedule
-func (pva *ContinuousVestingAccount) AddToOriginalVestedCoins(coins sdk.Coins) {
+func (cva *ContinuousVestingAccount) AddToOriginalVestedCoins(coins sdk.Coins) {
 	panic("AddToOriginalVestedCoins not implemented for ContinuousVestingAccount")
-	// pva.OriginalVesting = pva.OriginalVesting.Add(coins...)
+	// cva.OriginalVesting = cva.OriginalVesting.Add(coins...)
 }
 
 func (cva ContinuousVestingAccount) String() string {
diff --git a/x/bank/module.go b/x/bank/module.go
index 7bf224552374..41637596e9e5 100644
--- a/x/bank/module.go
+++ b/x/bank/module.go
@@ -86,7 +86,7 @@ func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry)
 	types.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the bank module.
 type AppModule struct {
@@ -160,7 +160,7 @@ func (AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Validato
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 
diff --git a/x/crisis/handler_test.go b/x/crisis/handler_test.go
index 16365847ae81..f36ec77e3a8c 100644
--- a/x/crisis/handler_test.go
+++ b/x/crisis/handler_test.go
@@ -47,7 +47,7 @@ func createTestApp() (*simapp.SimApp, sdk.Context, []sdk.AccAddress) {
 	return app, ctx, addrs
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 func TestHandleMsgVerifyInvariant(t *testing.T) {
 	app, ctx, addrs := createTestApp()
diff --git a/x/crisis/keeper/msg_server.go b/x/crisis/keeper/msg_server.go
index 0b885825a01d..d8e4dc33e583 100644
--- a/x/crisis/keeper/msg_server.go
+++ b/x/crisis/keeper/msg_server.go
@@ -56,7 +56,7 @@ func (k Keeper) VerifyInvariant(goCtx context.Context, msg *types.MsgVerifyInvar
 		// logger := ctx.Logger().With("module", "x/crisis")
 		// logger.Error(fmt.Sprintf(
 		// "WARNING: insufficient funds to allocate to sender from fee pool, err: %s", err))
-		//}
+		// }
 
 		// TODO replace with circuit breaker
 		panic(res)
diff --git a/x/crisis/module.go b/x/crisis/module.go
index 4da832fd881a..bcff1766a3f5 100644
--- a/x/crisis/module.go
+++ b/x/crisis/module.go
@@ -80,7 +80,7 @@ func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry)
 	types.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the crisis module.
 type AppModule struct {
diff --git a/x/distribution/module.go b/x/distribution/module.go
index 2bcbe759153e..1de22a1d3e2d 100644
--- a/x/distribution/module.go
+++ b/x/distribution/module.go
@@ -88,7 +88,7 @@ func (b AppModuleBasic) RegisterInterfaces(registry cdctypes.InterfaceRegistry)
 	types.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the distribution module.
 type AppModule struct {
@@ -172,7 +172,7 @@ func (AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Validato
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 
diff --git a/x/evidence/module.go b/x/evidence/module.go
index 126bfd83d45f..ade8209e820a 100644
--- a/x/evidence/module.go
+++ b/x/evidence/module.go
@@ -186,7 +186,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.Val
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 
diff --git a/x/genutil/module.go b/x/genutil/module.go
index 8fbffa9cc8d8..389841e645e9 100644
--- a/x/genutil/module.go
+++ b/x/genutil/module.go
@@ -66,7 +66,7 @@ func (AppModuleBasic) GetTxCmd() *cobra.Command { return nil }
 // GetQueryCmd returns no root query command for the genutil module.
 func (AppModuleBasic) GetQueryCmd() *cobra.Command { return nil }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the genutil module.
 type AppModule struct {
diff --git a/x/gov/module.go b/x/gov/module.go
index 3bbe80d16875..d8bd828c2dfc 100644
--- a/x/gov/module.go
+++ b/x/gov/module.go
@@ -109,7 +109,7 @@ func (a AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry
 	types.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the gov module.
 type AppModule struct {
@@ -187,7 +187,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.Val
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 
diff --git a/x/ibc/applications/transfer/module.go b/x/ibc/applications/transfer/module.go
index 282243e46476..97f33691d977 100644
--- a/x/ibc/applications/transfer/module.go
+++ b/x/ibc/applications/transfer/module.go
@@ -154,7 +154,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.V
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 
@@ -183,7 +183,7 @@ func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.Weig
 	return nil
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // ValidateTransferChannelParams does validation of a newly created transfer channel. A transfer
 // channel must be UNORDERED, use the correct port (by default 'transfer'), and use the current
diff --git a/x/ibc/core/module.go b/x/ibc/core/module.go
index 998b4f0a9d73..f7cc8975d5d9 100644
--- a/x/ibc/core/module.go
+++ b/x/ibc/core/module.go
@@ -167,7 +167,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.V
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 
diff --git a/x/ibc/testing/mock/mock.go b/x/ibc/testing/mock/mock.go
index 00df78230169..b86e3fbea7c4 100644
--- a/x/ibc/testing/mock/mock.go
+++ b/x/ibc/testing/mock/mock.go
@@ -124,7 +124,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.V
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // OnChanOpenInit implements the IBCModule interface.
 func (am AppModule) OnChanOpenInit(
diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go
index 2f002b01abce..f03e526af4fd 100644
--- a/x/mint/keeper/keeper.go
+++ b/x/mint/keeper/keeper.go
@@ -45,7 +45,7 @@ func NewKeeper(
 	}
 }
 
-// ______________________________________________________________________
+// _____________________________________________________________________
 
 // Logger returns a module-specific logger.
 func (k Keeper) Logger(ctx sdk.Context) log.Logger {
@@ -71,7 +71,7 @@ func (k Keeper) SetMinter(ctx sdk.Context, minter types.Minter) {
 	store.Set(types.MinterKey, b)
 }
 
-// ______________________________________________________________________
+// _____________________________________________________________________
 
 // GetParams returns the total set of minting parameters.
 func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
@@ -84,7 +84,7 @@ func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
 	k.paramSpace.SetParamSet(ctx, &params)
 }
 
-// ______________________________________________________________________
+// _____________________________________________________________________
 
 // StakingTokenSupply implements an alias call to the underlying staking keeper's
 // StakingTokenSupply to be used in BeginBlocker.
diff --git a/x/mint/module.go b/x/mint/module.go
index b3c90967ac76..7af46277c8d2 100644
--- a/x/mint/module.go
+++ b/x/mint/module.go
@@ -82,7 +82,7 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command {
 	return cli.GetQueryCmd()
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the mint module.
 type AppModule struct {
@@ -156,7 +156,7 @@ func (AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Validato
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 
diff --git a/x/params/module.go b/x/params/module.go
index a22e699b2e46..4ee61bb5a87b 100644
--- a/x/params/module.go
+++ b/x/params/module.go
@@ -72,7 +72,7 @@ func (am AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistr
 	proposal.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the distribution module.
 type AppModule struct {
diff --git a/x/params/simulation/operations.go b/x/params/simulation/operations.go
index ecb062dd7bed..6e7619b7032b 100644
--- a/x/params/simulation/operations.go
+++ b/x/params/simulation/operations.go
@@ -43,7 +43,7 @@ func SimulateParamChangeProposalContent(paramChangePool []simulation.ParamChange
 		title := fmt.Sprintf("title from SimulateParamChangeProposalContent-%d", numProposals)
 		desc := fmt.Sprintf("desc from SimulateParamChangeProposalContent-%d. Random short desc: %s",
 			numProposals, simulation.RandStringOfLength(r, 20))
-		numProposals += 1
+		numProposals++
 		return proposal.NewParameterChangeProposal(
 			title,        // title
 			desc,         // description
diff --git a/x/simulation/log.go b/x/simulation/log.go
index 80632d04b53a..8545490ddc13 100644
--- a/x/simulation/log.go
+++ b/x/simulation/log.go
@@ -67,7 +67,7 @@ func createLogFile() *os.File {
 	return f
 }
 
-// _____________________
+// ____________________
 // dummy log writter
 type DummyLogWriter struct{}
 
diff --git a/x/simulation/mock_tendermint.go b/x/simulation/mock_tendermint.go
index 8df71dbcc2f4..391b69bea4b0 100644
--- a/x/simulation/mock_tendermint.go
+++ b/x/simulation/mock_tendermint.go
@@ -59,7 +59,7 @@ func (vals mockValidators) getKeys() []string {
 	return keys
 }
 
-// _________________________________________________________________________________
+// ________________________________________________________________________________
 
 // randomProposer picks a random proposer from the current validator set
 func (vals mockValidators) randomProposer(r *rand.Rand) tmbytes.HexBytes {
diff --git a/x/simulation/operation.go b/x/simulation/operation.go
index be396368435c..7da0a7f575f9 100644
--- a/x/simulation/operation.go
+++ b/x/simulation/operation.go
@@ -64,7 +64,7 @@ func (oe OperationEntry) MustMarshal() json.RawMessage {
 	return out
 }
 
-// _____________________________________________________________________
+// ____________________________________________________________________
 
 // OperationQueue defines an object for a queue of operations
 type OperationQueue map[int][]simulation.Operation
@@ -107,7 +107,7 @@ func queueOperations(queuedOps OperationQueue, queuedTimeOps []simulation.Future
 	}
 }
 
-// ________________________________________________________________________
+// _______________________________________________________________________
 
 // WeightedOperation is an operation with associated weight.
 // This is used to bias the selection operation within the simulator.
diff --git a/x/simulation/simulate.go b/x/simulation/simulate.go
index 31abcc432a8b..c81872270c78 100644
--- a/x/simulation/simulate.go
+++ b/x/simulation/simulate.go
@@ -240,7 +240,7 @@ func SimulateFromSeed(
 	return false, exportedParams, nil
 }
 
-// ______________________________________________________________________________
+// _____________________________________________________________________________
 
 type blockSimFn func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context,
 	accounts []simulation.Account, header tmproto.Header) (opCount int)
diff --git a/x/slashing/keeper/hooks.go b/x/slashing/keeper/hooks.go
index 7ec81ebd2025..58417cd5b9fc 100644
--- a/x/slashing/keeper/hooks.go
+++ b/x/slashing/keeper/hooks.go
@@ -45,7 +45,7 @@ func (k Keeper) AfterValidatorRemoved(ctx sdk.Context, address sdk.ConsAddress)
 	k.deleteAddrPubkeyRelation(ctx, crypto.Address(address))
 }
 
-// _________________________________________________________________________________________
+// ________________________________________________________________________________________
 
 // Hooks wrapper struct for slashing keeper
 type Hooks struct {
diff --git a/x/slashing/module.go b/x/slashing/module.go
index bc761628b80c..f1de4a5a3b11 100644
--- a/x/slashing/module.go
+++ b/x/slashing/module.go
@@ -91,7 +91,7 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command {
 	return cli.GetQueryCmd()
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the slashing module.
 type AppModule struct {
@@ -170,7 +170,7 @@ func (AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Validato
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 
diff --git a/x/staking/keeper/alias_functions.go b/x/staking/keeper/alias_functions.go
index 0e81312aa0ce..bee1c412f788 100644
--- a/x/staking/keeper/alias_functions.go
+++ b/x/staking/keeper/alias_functions.go
@@ -7,7 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 
-// _______________________________________________________________________
+// ______________________________________________________________________
 // Validator Set
 
 // iterate through the validator set and perform the provided function
@@ -96,7 +96,7 @@ func (k Keeper) ValidatorByConsAddr(ctx sdk.Context, addr sdk.ConsAddress) types
 	return val
 }
 
-// _______________________________________________________________________
+// ______________________________________________________________________
 // Delegation Set
 
 // Returns self as it is both a validatorset and delegationset
diff --git a/x/staking/keeper/querier.go b/x/staking/keeper/querier.go
index 6e3be1526ada..aa39cf627774 100644
--- a/x/staking/keeper/querier.go
+++ b/x/staking/keeper/querier.go
@@ -443,7 +443,7 @@ func queryParameters(ctx sdk.Context, k Keeper, legacyQuerierCdc *codec.LegacyAm
 	return res, nil
 }
 
-// ______________________________________________________
+// _____________________________________________________
 // util
 
 func DelegationToDelegationResponse(ctx sdk.Context, k Keeper, del types.Delegation) (types.DelegationResponse, error) {
diff --git a/x/staking/keeper/query_utils.go b/x/staking/keeper/query_utils.go
index 92dde56e514f..dd969b03d36b 100644
--- a/x/staking/keeper/query_utils.go
+++ b/x/staking/keeper/query_utils.go
@@ -50,7 +50,7 @@ func (k Keeper) GetDelegatorValidator(
 	return validator, nil
 }
 
-// _____________________________________________________________________________________
+// ____________________________________________________________________________________
 
 // return all delegations for a delegator
 func (k Keeper) GetAllDelegatorDelegations(ctx sdk.Context, delegator sdk.AccAddress) []types.Delegation {
diff --git a/x/staking/keeper/slash_test.go b/x/staking/keeper/slash_test.go
index b77e87d2f2d7..4107fb6153cc 100644
--- a/x/staking/keeper/slash_test.go
+++ b/x/staking/keeper/slash_test.go
@@ -385,7 +385,7 @@ func TestSlashWithUnbondingDelegation(t *testing.T) {
 	require.Equal(t, validator.GetStatus(), types.Unbonding)
 }
 
-// _________________________________________________________________________________
+// ________________________________________________________________________________
 // tests Slash at a previous height with a redelegation
 func TestSlashWithRedelegation(t *testing.T) {
 	app, ctx, addrDels, addrVals := bootstrapSlashTest(t, 10)
diff --git a/x/staking/keeper/validator.go b/x/staking/keeper/validator.go
index b70a7fa68358..0047eaa67c5c 100644
--- a/x/staking/keeper/validator.go
+++ b/x/staking/keeper/validator.go
@@ -266,7 +266,7 @@ func (k Keeper) ValidatorsPowerStoreIterator(ctx sdk.Context) sdk.Iterator {
 	return sdk.KVStoreReversePrefixIterator(store, types.ValidatorsByPowerIndexKey)
 }
 
-// _______________________________________________________________________
+// ______________________________________________________________________
 // Last Validator Index
 
 // Load the last validator power.
diff --git a/x/staking/module.go b/x/staking/module.go
index 6857d2ed92fb..62a6a2ee2003 100644
--- a/x/staking/module.go
+++ b/x/staking/module.go
@@ -168,7 +168,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.Val
 	return EndBlocker(ctx, am.keeper)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 
diff --git a/x/staking/types/expected_keepers.go b/x/staking/types/expected_keepers.go
index b7479d8fd089..b293179014b8 100644
--- a/x/staking/types/expected_keepers.go
+++ b/x/staking/types/expected_keepers.go
@@ -83,7 +83,7 @@ type DelegationSet interface {
 		fn func(index int64, delegation DelegationI) (stop bool))
 }
 
-// _______________________________________________________________________________
+// ______________________________________________________________________________
 // Event Hooks
 // These can be utilized to communicate between a staking keeper and another
 // keeper which must take particular actions when validators/delegators change
diff --git a/x/staking/types/params.go b/x/staking/types/params.go
index 2ad8e9134c61..cae91802a596 100644
--- a/x/staking/types/params.go
+++ b/x/staking/types/params.go
@@ -35,6 +35,11 @@ const (
 // DefaultMinCommissionRate is set to 0%
 var DefaultMinCommissionRate = sdk.ZeroDec()
 
+var (
+	// DefaultMinCommissionRate is set to 0%
+	DefaultMinCommissionRate = sdk.ZeroDec()
+)
+
 var (
 	KeyUnbondingTime     = []byte("UnbondingTime")
 	KeyMaxValidators     = []byte("MaxValidators")