diff --git a/.golangci.yml b/.golangci.yml
index 34738ccf7e6f..1cbfa6a6c097 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -56,6 +56,9 @@ issues:
     - text: "ST1016:"
       linters:
         - stylecheck
+    - text: "SA1019: codec.LegacyAmino is deprecated"
+      linters:
+        - staticcheck
   max-issues-per-linter: 10000
   max-same-issues: 10000
 
diff --git a/client/docs/statik/init.go b/client/docs/statik/init.go
index 7d91b40fcd37..db70716be44b 100644
--- a/client/docs/statik/init.go
+++ b/client/docs/statik/init.go
@@ -1,3 +1,3 @@
 package statik
 
-//This just for fixing the error in importing empty github.com/cosmos/cosmos-sdk/client/docs/statik
+// This just for fixing the error in importing empty github.com/cosmos/cosmos-sdk/client/docs/statik
diff --git a/client/rest/rest.go b/client/rest/rest.go
index ac05891e04c7..1fd715a642e1 100644
--- a/client/rest/rest.go
+++ b/client/rest/rest.go
@@ -22,6 +22,7 @@ func addHTTPDeprecationHeaders(h http.Handler) http.Handler {
 	})
 }
 
+// nolint
 // 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.
diff --git a/client/rpc/block.go b/client/rpc/block.go
index d6b79c9fe6da..530f7c45df73 100644
--- a/client/rpc/block.go
+++ b/client/rpc/block.go
@@ -15,7 +15,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/rest"
 )
 
-//BlockCommand returns the verified block data for a given heights
+// BlockCommand returns the verified block data for a given heights
 func BlockCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "block [height]",
diff --git a/client/rpc/validators.go b/client/rpc/validators.go
index 66c594966ed7..7c68d1ab7c79 100644
--- a/client/rpc/validators.go
+++ b/client/rpc/validators.go
@@ -22,7 +22,7 @@ import (
 
 // TODO these next two functions feel kinda hacky based on their placement
 
-//ValidatorCommand returns the validator set for a given height
+// ValidatorCommand returns the validator set for a given height
 func ValidatorCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "tendermint-validator-set [height]",
diff --git a/codec/amino.go b/codec/amino.go
index 78fd650ca4b8..72aed1caa350 100644
--- a/codec/amino.go
+++ b/codec/amino.go
@@ -13,7 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec/types"
 )
 
-// deprecated: LegacyAmino defines a wrapper for an Amino codec that properly handles protobuf
+// Deprecated: LegacyAmino defines a wrapper for an Amino codec that properly handles protobuf
 // types with Any's
 type LegacyAmino struct {
 	Amino *amino.Codec
diff --git a/crypto/keyring/legacy.go b/crypto/keyring/legacy.go
index 59bdc3fc5dad..f30513e03e0b 100644
--- a/crypto/keyring/legacy.go
+++ b/crypto/keyring/legacy.go
@@ -40,6 +40,7 @@ func NewLegacy(name, dir string, opts ...KeybaseOption) (LegacyKeybase, error) {
 
 var _ LegacyKeybase = dbKeybase{}
 
+// nolint
 // dbKeybase combines encryption and storage implementation to provide a
 // full-featured key manager.
 //
diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go
index 83f2ea45351f..6921b4875a6f 100644
--- a/simapp/test_helpers.go
+++ b/simapp/test_helpers.go
@@ -213,9 +213,9 @@ func createIncrementalAccounts(accNum int) []sdk.AccAddress {
 	// start at 100 so we can make up to 999 test addresses with valid test addresses
 	for i := 100; i < (accNum + 100); i++ {
 		numString := strconv.Itoa(i)
-		buffer.WriteString("A58856F0FD53BF058B4909A21AEC019107BA6") //base address string
+		buffer.WriteString("A58856F0FD53BF058B4909A21AEC019107BA6") // base address string
 
-		buffer.WriteString(numString) //adding on final two digits to make addresses unique
+		buffer.WriteString(numString) // adding on final two digits to make addresses unique
 		res, _ := sdk.AccAddressFromHex(buffer.String())
 		bech := res.String()
 		addr, _ := TestAddr(buffer.String(), bech)
diff --git a/store/gaskv/store.go b/store/gaskv/store.go
index d5c1f86c20aa..06b55f5ead48 100644
--- a/store/gaskv/store.go
+++ b/store/gaskv/store.go
@@ -19,7 +19,6 @@ type Store struct {
 }
 
 // NewStore returns a reference to a new GasKVStore.
-// nolint
 func NewStore(parent types.KVStore, gasMeter types.GasMeter, gasConfig types.GasConfig) *Store {
 	kvs := &Store{
 		gasMeter:  gasMeter,
diff --git a/types/decimal.go b/types/decimal.go
index 6db1f587de7a..36b65bd983b7 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 {
@@ -198,8 +198,7 @@ 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
@@ -564,7 +563,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 {
@@ -615,7 +614,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.
@@ -651,7 +650,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
@@ -761,7 +760,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 3eb86d8ec6ae..dae0935febd2 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/errors/errors.go b/types/errors/errors.go
index 1aa68816ccbf..026f5f569b41 100644
--- a/types/errors/errors.go
+++ b/types/errors/errors.go
@@ -15,7 +15,6 @@ const UndefinedCodespace = "undefined"
 
 var (
 	// errInternal should never be exposed, but we reserve this code for non-specified errors
-	//nolint
 	errInternal = Register(UndefinedCodespace, 1, "internal")
 
 	// ErrTxDecode is returned if we cannot parse a transaction
diff --git a/types/module/module.go b/types/module/module.go
index 2379c93d5ebd..5b47b8c84815 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/config.go b/types/simulation/config.go
index 58a39bb17d5b..8bad709545c9 100644
--- a/types/simulation/config.go
+++ b/types/simulation/config.go
@@ -6,8 +6,8 @@ type Config struct {
 	ParamsFile  string // custom simulation params file which overrides any random params; cannot be used with genesis
 
 	ExportParamsPath   string // custom file path to save the exported params JSON
-	ExportParamsHeight int    //height to which export the randomly generated params
-	ExportStatePath    string //custom file path to save the exported app state JSON
+	ExportParamsHeight int    // height to which export the randomly generated params
+	ExportStatePath    string // custom file path to save the exported app state JSON
 	ExportStatsPath    string // custom file path to save the exported simulation statistics JSON
 
 	Seed               int64  // simulation random seed
diff --git a/types/simulation/types.go b/types/simulation/types.go
index f541b1d764de..090978bf6e15 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 2305d7386728..a42c78395ed6 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/legacy/v034/types.go b/x/auth/legacy/v034/types.go
index c5df671017b2..83fa2d36eace 100644
--- a/x/auth/legacy/v034/types.go
+++ b/x/auth/legacy/v034/types.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v034
 
 import (
diff --git a/x/auth/legacy/v036/migrate.go b/x/auth/legacy/v036/migrate.go
index c651df6994d8..2ab4aa14379b 100644
--- a/x/auth/legacy/v036/migrate.go
+++ b/x/auth/legacy/v036/migrate.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v036
 
 import (
diff --git a/x/auth/legacy/v036/types.go b/x/auth/legacy/v036/types.go
index 2490f4baa22e..908165f26505 100644
--- a/x/auth/legacy/v036/types.go
+++ b/x/auth/legacy/v036/types.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v036
 
 import v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v034"
diff --git a/x/auth/legacy/v038/types.go b/x/auth/legacy/v038/types.go
index e9977c1d2966..b7dedf003e13 100644
--- a/x/auth/legacy/v038/types.go
+++ b/x/auth/legacy/v038/types.go
@@ -1,7 +1,6 @@
 package v038
 
 // DONTCOVER
-// nolint
 
 import (
 	"bytes"
diff --git a/x/auth/legacy/v039/types.go b/x/auth/legacy/v039/types.go
index 55c3014eb7f0..3de576f27ffa 100644
--- a/x/auth/legacy/v039/types.go
+++ b/x/auth/legacy/v039/types.go
@@ -1,7 +1,6 @@
 package v039
 
 // DONTCOVER
-// nolint
 
 import (
 	"bytes"
diff --git a/x/auth/module.go b/x/auth/module.go
index 73aa9a1066a9..7a9e6c749f94 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/testutil/suite.go b/x/auth/testutil/suite.go
index f8002e68e4e6..23c59b7fcfba 100644
--- a/x/auth/testutil/suite.go
+++ b/x/auth/testutil/suite.go
@@ -16,7 +16,7 @@ import (
 )
 
 // TxConfigTestSuite provides a test suite that can be used to test that a TxConfig implementation is correct
-//nolint:golint  // type name will be used as tx.TxConfigTestSuite by other packages, and that stutters; consider calling this GeneratorTestSuite
+// type name will be used as tx.TxConfigTestSuite by other packages, and that stutters; consider calling this GeneratorTestSuite
 type TxConfigTestSuite struct {
 	suite.Suite
 	TxConfig client.TxConfig
diff --git a/x/auth/types/account_retriever.go b/x/auth/types/account_retriever.go
index f84c744188ff..792524fff017 100644
--- a/x/auth/types/account_retriever.go
+++ b/x/auth/types/account_retriever.go
@@ -32,7 +32,6 @@ func (ar AccountRetriever) GetAccount(clientCtx client.Context, addr sdk.AccAddr
 // GetAccountWithHeight queries for an account given an address. Returns the
 // height of the query with the account. An error is returned if the query
 // or decoding fails.
-//nolint:interfacer
 func (ar AccountRetriever) GetAccountWithHeight(clientCtx client.Context, addr sdk.AccAddress) (client.Account, int64, error) {
 	var header metadata.MD
 
diff --git a/x/auth/types/params.go b/x/auth/types/params.go
index 710ee963b4a3..13db369d2353 100644
--- a/x/auth/types/params.go
+++ b/x/auth/types/params.go
@@ -48,7 +48,6 @@ func ParamKeyTable() paramtypes.KeyTable {
 
 // ParamSetPairs implements the ParamSet interface and returns all the key/value pairs
 // pairs of auth module's parameters.
-// nolint
 func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
 	return paramtypes.ParamSetPairs{
 		paramtypes.NewParamSetPair(KeyMaxMemoCharacters, &p.MaxMemoCharacters, validateMaxMemoCharacters),
diff --git a/x/bank/legacy/v036/types.go b/x/bank/legacy/v036/types.go
index 1de8ffb9b71f..ada368404855 100644
--- a/x/bank/legacy/v036/types.go
+++ b/x/bank/legacy/v036/types.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v036
 
 import (
diff --git a/x/bank/legacy/v038/types.go b/x/bank/legacy/v038/types.go
index e67640bf2b12..eba8d3518ca1 100644
--- a/x/bank/legacy/v038/types.go
+++ b/x/bank/legacy/v038/types.go
@@ -1,7 +1,6 @@
 package v038
 
 // DONTCOVER
-// nolint
 
 const (
 	ModuleName = "bank"
diff --git a/x/bank/module.go b/x/bank/module.go
index f271fa21975c..c0fb03999d05 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/bank/simulation/operations.go b/x/bank/simulation/operations.go
index 9fcc80f0fe45..632ed11f5ffe 100644
--- a/x/bank/simulation/operations.go
+++ b/x/bank/simulation/operations.go
@@ -81,7 +81,6 @@ func SimulateMsgSend(ak types.AccountKeeper, bk keeper.Keeper) simtypes.Operatio
 }
 
 // sendMsgSend sends a transaction with a MsgSend from a provided random account.
-// nolint: interfacer
 func sendMsgSend(
 	r *rand.Rand, app *baseapp.BaseApp, bk keeper.Keeper, ak types.AccountKeeper,
 	msg *types.MsgSend, ctx sdk.Context, chainID string, privkeys []cryptotypes.PrivKey,
@@ -222,8 +221,6 @@ func SimulateMsgMultiSend(ak types.AccountKeeper, bk keeper.Keeper) simtypes.Ope
 }
 
 // sendMsgMultiSend sends a transaction with a MsgMultiSend from a provided random
-// account.
-// nolint: interfacer
 func sendMsgMultiSend(
 	r *rand.Rand, app *baseapp.BaseApp, bk keeper.Keeper, ak types.AccountKeeper,
 	msg *types.MsgMultiSend, ctx sdk.Context, chainID string, privkeys []cryptotypes.PrivKey,
@@ -289,7 +286,6 @@ func sendMsgMultiSend(
 
 // randomSendFields returns the sender and recipient simulation accounts as well
 // as the transferred amount.
-// nolint: interfacer
 func randomSendFields(
 	r *rand.Rand, ctx sdk.Context, accs []simtypes.Account, bk keeper.Keeper, ak types.AccountKeeper,
 ) (simtypes.Account, simtypes.Account, sdk.Coins, bool) {
diff --git a/x/crisis/handler_test.go b/x/crisis/handler_test.go
index dcde377f6d42..c35af8ee8775 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 304f8b17243d..0b885825a01d 100644
--- a/x/crisis/keeper/msg_server.go
+++ b/x/crisis/keeper/msg_server.go
@@ -48,14 +48,14 @@ func (k Keeper) VerifyInvariant(goCtx context.Context, msg *types.MsgVerifyInvar
 		// refund is required.
 
 		// TODO uncomment the following code block with implementation of the circuit breaker
-		//// refund constant fee
-		//err := k.distrKeeper.DistributeFromFeePool(ctx, constantFee, msg.Sender)
-		//if err != nil {
-		//// if there are insufficient coins to refund, log the error,
-		//// but still halt the chain.
-		//logger := ctx.Logger().With("module", "x/crisis")
-		//logger.Error(fmt.Sprintf(
-		//"WARNING: insufficient funds to allocate to sender from fee pool, err: %s", err))
+		// // refund constant fee
+		// err := k.distrKeeper.DistributeFromFeePool(ctx, constantFee, msg.Sender)
+		// if err != nil {
+		// // if there are insufficient coins to refund, log the error,
+		// // but still halt the chain.
+		// 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
diff --git a/x/crisis/module.go b/x/crisis/module.go
index 5d34c1ce28f9..4da832fd881a 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/legacy/v034/types.go b/x/distribution/legacy/v034/types.go
index 3ef672f4af3b..4e8b209ad67b 100644
--- a/x/distribution/legacy/v034/types.go
+++ b/x/distribution/legacy/v034/types.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v034
 
 import (
diff --git a/x/distribution/legacy/v036/types.go b/x/distribution/legacy/v036/types.go
index 1c43eb5acd2a..e6a5d9232414 100644
--- a/x/distribution/legacy/v036/types.go
+++ b/x/distribution/legacy/v036/types.go
@@ -1,5 +1,5 @@
 // DONTCOVER
-// nolint
+
 package v036
 
 import (
diff --git a/x/distribution/legacy/v038/migrate.go b/x/distribution/legacy/v038/migrate.go
index cd00668b1efd..73e933da4589 100644
--- a/x/distribution/legacy/v038/migrate.go
+++ b/x/distribution/legacy/v038/migrate.go
@@ -1,7 +1,6 @@
 package v038
 
 // DONTCOVER
-// nolint
 
 import (
 	v036distr "github.com/cosmos/cosmos-sdk/x/distribution/legacy/v036"
diff --git a/x/distribution/legacy/v038/types.go b/x/distribution/legacy/v038/types.go
index af7146418dbc..335fbc1245e2 100644
--- a/x/distribution/legacy/v038/types.go
+++ b/x/distribution/legacy/v038/types.go
@@ -7,7 +7,6 @@ import (
 )
 
 // DONTCOVER
-// nolint
 
 const (
 	ModuleName = "distribution"
diff --git a/x/distribution/module.go b/x/distribution/module.go
index 034be6d9651d..339fdfde55e0 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 4367fe8d58ce..991ab271b0a5 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/genaccounts/legacy/v034/types.go b/x/genaccounts/legacy/v034/types.go
index 080b534d8ec1..f4bb73fa37c4 100644
--- a/x/genaccounts/legacy/v034/types.go
+++ b/x/genaccounts/legacy/v034/types.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v034
 
 import (
diff --git a/x/genaccounts/legacy/v036/types.go b/x/genaccounts/legacy/v036/types.go
index 8d143e69d2dc..e91db341db48 100644
--- a/x/genaccounts/legacy/v036/types.go
+++ b/x/genaccounts/legacy/v036/types.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v036
 
 import (
diff --git a/x/genutil/module.go b/x/genutil/module.go
index bfaeb0c59168..ba0d76a01a94 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/client/rest/rest.go b/x/gov/client/rest/rest.go
index f11798e96760..46d66c240bc2 100644
--- a/x/gov/client/rest/rest.go
+++ b/x/gov/client/rest/rest.go
@@ -12,7 +12,6 @@ import (
 )
 
 // REST Variable names
-// nolint
 const (
 	RestParamsType     = "type"
 	RestProposalID     = "proposal-id"
diff --git a/x/gov/client/utils/utils.go b/x/gov/client/utils/utils.go
index 86e4dc5f3e96..2562dab08cfe 100644
--- a/x/gov/client/utils/utils.go
+++ b/x/gov/client/utils/utils.go
@@ -22,7 +22,7 @@ func NormalizeVoteOption(option string) string {
 	}
 }
 
-//NormalizeProposalType - normalize user specified proposal type
+// NormalizeProposalType - normalize user specified proposal type
 func NormalizeProposalType(proposalType string) string {
 	switch proposalType {
 	case "Text", "text":
@@ -33,7 +33,7 @@ func NormalizeProposalType(proposalType string) string {
 	}
 }
 
-//NormalizeProposalStatus - normalize user specified proposal status
+// NormalizeProposalStatus - normalize user specified proposal status
 func NormalizeProposalStatus(status string) string {
 	switch status {
 	case "DepositPeriod", "deposit_period":
diff --git a/x/gov/legacy/v034/types.go b/x/gov/legacy/v034/types.go
index dd98cca21be3..14e0b7a26590 100644
--- a/x/gov/legacy/v034/types.go
+++ b/x/gov/legacy/v034/types.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v034
 
 import (
diff --git a/x/gov/legacy/v036/types.go b/x/gov/legacy/v036/types.go
index d0bc4620bc73..6632c6da255c 100644
--- a/x/gov/legacy/v036/types.go
+++ b/x/gov/legacy/v036/types.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v036
 
 import (
diff --git a/x/gov/module.go b/x/gov/module.go
index ad2191660c08..b2eb38c1d33e 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 764f61e92bba..f0d8aa2cb5c6 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 3371dc88a446..506bb1338973 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 663497aa05ca..00df78230169 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 de0a31222845..2f002b01abce 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 44e96ce74bda..6cef957040ec 100644
--- a/x/mint/module.go
+++ b/x/mint/module.go
@@ -83,7 +83,7 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command {
 	return cli.GetQueryCmd()
 }
 
-//____________________________________________________________________________
+// ____________________________________________________________________________
 
 // AppModule implements an application module for the mint module.
 type AppModule struct {
@@ -157,7 +157,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 b0a4584129ef..d7aaabf9ddca 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/simulation/log.go b/x/simulation/log.go
index 236a7244074f..b50163b33c33 100644
--- a/x/simulation/log.go
+++ b/x/simulation/log.go
@@ -68,7 +68,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 ad84e8213d54..aea7cb2cf7a7 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 914daafc8b91..be396368435c 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 fdcf224611ba..a60f6b7feaa2 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 d59601425842..4a99b10e9f93 100644
--- a/x/slashing/keeper/hooks.go
+++ b/x/slashing/keeper/hooks.go
@@ -42,7 +42,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 91ad472e90df..de773738a206 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/slashing/simulation/operations.go b/x/slashing/simulation/operations.go
index 20acc9e91a88..753def5fa5c3 100644
--- a/x/slashing/simulation/operations.go
+++ b/x/slashing/simulation/operations.go
@@ -43,7 +43,6 @@ func WeightedOperations(
 }
 
 // SimulateMsgUnjail generates a MsgUnjail with random values
-// nolint: interfacer
 func SimulateMsgUnjail(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, sk stakingkeeper.Keeper) simtypes.Operation {
 	return func(
 		r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context,
diff --git a/x/slashing/types/events.go b/x/slashing/types/events.go
index 62b6493c34a1..2e7eca79e950 100644
--- a/x/slashing/types/events.go
+++ b/x/slashing/types/events.go
@@ -1,4 +1,4 @@
-//noalias
+// noalias
 package types
 
 // Slashing module event types
diff --git a/x/staking/keeper/alias_functions.go b/x/staking/keeper/alias_functions.go
index 1d563c690783..17ae5df2655c 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 48272e245191..dc27ce6bb795 100644
--- a/x/staking/keeper/querier.go
+++ b/x/staking/keeper/querier.go
@@ -444,7 +444,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 a6f323092ae6..92dde56e514f 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 {
@@ -59,7 +59,7 @@ func (k Keeper) GetAllDelegatorDelegations(ctx sdk.Context, delegator sdk.AccAdd
 	store := ctx.KVStore(k.storeKey)
 	delegatorPrefixKey := types.GetDelegationsKey(delegator)
 
-	iterator := sdk.KVStorePrefixIterator(store, delegatorPrefixKey) //smallest to largest
+	iterator := sdk.KVStorePrefixIterator(store, delegatorPrefixKey) // smallest to largest
 	defer iterator.Close()
 
 	i := 0
diff --git a/x/staking/keeper/slash_test.go b/x/staking/keeper/slash_test.go
index 0760533ab9f0..03d0c90b2d70 100644
--- a/x/staking/keeper/slash_test.go
+++ b/x/staking/keeper/slash_test.go
@@ -384,7 +384,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 3aa1441767a4..0cc27098d87c 100644
--- a/x/staking/keeper/validator.go
+++ b/x/staking/keeper/validator.go
@@ -240,7 +240,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/legacy/v034/types.go b/x/staking/legacy/v034/types.go
index 9f8622d4bec2..539e6534bc5f 100644
--- a/x/staking/legacy/v034/types.go
+++ b/x/staking/legacy/v034/types.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v034
 
 import (
diff --git a/x/staking/legacy/v036/migrate.go b/x/staking/legacy/v036/migrate.go
index cc4d7a4089b6..bb1f78bc4045 100644
--- a/x/staking/legacy/v036/migrate.go
+++ b/x/staking/legacy/v036/migrate.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v036
 
 import (
diff --git a/x/staking/legacy/v036/types.go b/x/staking/legacy/v036/types.go
index b433b0070100..44cf3746d153 100644
--- a/x/staking/legacy/v036/types.go
+++ b/x/staking/legacy/v036/types.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v036
 
 import (
diff --git a/x/staking/legacy/v038/migrate.go b/x/staking/legacy/v038/migrate.go
index 21029881a3fd..d2f65edadfe7 100644
--- a/x/staking/legacy/v038/migrate.go
+++ b/x/staking/legacy/v038/migrate.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v038
 
 import (
diff --git a/x/staking/legacy/v038/types.go b/x/staking/legacy/v038/types.go
index 58ffa1351ba5..e11157d0e473 100644
--- a/x/staking/legacy/v038/types.go
+++ b/x/staking/legacy/v038/types.go
@@ -1,5 +1,4 @@
 // DONTCOVER
-// nolint
 package v038
 
 import (
diff --git a/x/staking/module.go b/x/staking/module.go
index f2e422117476..48b5c6506527 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/simulation/operations.go b/x/staking/simulation/operations.go
index 0bcb274ed717..11623509480a 100644
--- a/x/staking/simulation/operations.go
+++ b/x/staking/simulation/operations.go
@@ -92,7 +92,6 @@ func WeightedOperations(
 }
 
 // SimulateMsgCreateValidator generates a MsgCreateValidator with random values
-// nolint: interfacer
 func SimulateMsgCreateValidator(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) simtypes.Operation {
 	return func(
 		r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,
@@ -178,7 +177,6 @@ func SimulateMsgCreateValidator(ak types.AccountKeeper, bk types.BankKeeper, k k
 }
 
 // SimulateMsgEditValidator generates a MsgEditValidator with random values
-// nolint: interfacer
 func SimulateMsgEditValidator(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) simtypes.Operation {
 	return func(
 		r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,
@@ -249,7 +247,6 @@ func SimulateMsgEditValidator(ak types.AccountKeeper, bk types.BankKeeper, k kee
 }
 
 // SimulateMsgDelegate generates a MsgDelegate with random values
-// nolint: interfacer
 func SimulateMsgDelegate(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) simtypes.Operation {
 	return func(
 		r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,
@@ -322,7 +319,6 @@ func SimulateMsgDelegate(ak types.AccountKeeper, bk types.BankKeeper, k keeper.K
 }
 
 // SimulateMsgUndelegate generates a MsgUndelegate with random values
-// nolint: interfacer
 func SimulateMsgUndelegate(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) simtypes.Operation {
 	return func(
 		r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,
@@ -412,7 +408,6 @@ func SimulateMsgUndelegate(ak types.AccountKeeper, bk types.BankKeeper, k keeper
 }
 
 // SimulateMsgBeginRedelegate generates a MsgBeginRedelegate with random values
-// nolint: interfacer
 func SimulateMsgBeginRedelegate(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) simtypes.Operation {
 	return func(
 		r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,
diff --git a/x/staking/types/expected_keepers.go b/x/staking/types/expected_keepers.go
index 1c1d7f7de96b..b7479d8fd089 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/validator.go b/x/staking/types/validator.go
index e551e752528c..b23a7708f094 100644
--- a/x/staking/types/validator.go
+++ b/x/staking/types/validator.go
@@ -103,9 +103,7 @@ func (v Validators) Less(i, j int) bool {
 
 // Implements sort interface
 func (v Validators) Swap(i, j int) {
-	it := v[i]
-	v[i] = v[j]
-	v[j] = it
+	v[i], v[j] = v[j], v[i]
 }
 
 // ValidatorsByVotingPower implements sort.Interface for []Validator based on