diff --git a/types/module/module_test.go b/types/module/module_test.go
index e751889c71a9..56c810c6b190 100644
--- a/types/module/module_test.go
+++ b/types/module/module_test.go
@@ -141,9 +141,9 @@ func TestManager_RegisterRoutes(t *testing.T) {
 
 	router := mocks.NewMockRouter(mockCtrl)
 	handler1, handler2 := sdk.Handler(func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
-		return nil,nil
+		return nil, nil
 	}), sdk.Handler(func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
-		return nil,nil
+		return nil, nil
 	})
 	route1 := sdk.NewRoute("route1", handler1)
 	route2 := sdk.NewRoute("route2", handler2)
diff --git a/types/router_test.go b/types/router_test.go
index 4721fed6da42..a3df95ae6a26 100644
--- a/types/router_test.go
+++ b/types/router_test.go
@@ -1,24 +1,25 @@
 package types
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNilRoute(t *testing.T) {
-	tests := []struct{
-		name string
-		route Route
+	tests := []struct {
+		name     string
+		route    Route
 		expected bool
-	} {
+	}{
 		{
-			name: "all empty",
-			route: NewRoute("", nil),
+			name:     "all empty",
+			route:    NewRoute("", nil),
 			expected: true,
 		},
 		{
-			name: "only path",
-			route: NewRoute("some", nil),
+			name:     "only path",
+			route:    NewRoute("some", nil),
 			expected: true,
 		},
 		{
@@ -37,7 +38,7 @@ func TestNilRoute(t *testing.T) {
 		},
 	}
 
- 	for _, tt := range tests {
+	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			assert.Equal(t, tt.expected, tt.route.Empty())
diff --git a/x/ibc/02-client/exported/exported.go b/x/ibc/02-client/exported/exported.go
index 8164cc9e0503..fb8972452aae 100644
--- a/x/ibc/02-client/exported/exported.go
+++ b/x/ibc/02-client/exported/exported.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 
 	ics23 "github.com/confio/ics23/go"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
diff --git a/x/ibc/04-channel/keeper/querier_test.go b/x/ibc/04-channel/keeper/querier_test.go
index d58823e69de0..565e4ff5a6ed 100644
--- a/x/ibc/04-channel/keeper/querier_test.go
+++ b/x/ibc/04-channel/keeper/querier_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 )
 
-// TestQueryChannels tests singular, muliple, and no connection for
+// TestQueryChannels tests singular, multiple, and no connection for
 // correct retrieval of all channels.
 func (suite *KeeperTestSuite) TestQueryChannels() {
 	path := []string{types.SubModuleName, types.QueryAllChannels}
diff --git a/x/ibc/09-localhost/types/client_state.go b/x/ibc/09-localhost/types/client_state.go
index e00d5f1987d5..92905bd50f04 100644
--- a/x/ibc/09-localhost/types/client_state.go
+++ b/x/ibc/09-localhost/types/client_state.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	ics23 "github.com/confio/ics23/go"
+
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
diff --git a/x/ibc/23-commitment/types/merkle.go b/x/ibc/23-commitment/types/merkle.go
index 582581e35a58..e16568bbc0db 100644
--- a/x/ibc/23-commitment/types/merkle.go
+++ b/x/ibc/23-commitment/types/merkle.go
@@ -5,6 +5,7 @@ import (
 	"net/url"
 
 	ics23 "github.com/confio/ics23/go"
+
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/exported"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
diff --git a/x/mint/client/cli/cli_test.go b/x/mint/client/cli/cli_test.go
index 1bbff9867b46..c2060de8bef2 100644
--- a/x/mint/client/cli/cli_test.go
+++ b/x/mint/client/cli/cli_test.go
@@ -5,9 +5,10 @@ package cli_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/cosmos/cosmos-sdk/tests/cli"
 	"github.com/cosmos/cosmos-sdk/x/mint/client/testutil"
-	"github.com/stretchr/testify/require"
 )
 
 func TestCLIMintQueries(t *testing.T) {
diff --git a/x/mint/client/testutil/helpers.go b/x/mint/client/testutil/helpers.go
index 8b686cced76a..2a8f6ac9796e 100644
--- a/x/mint/client/testutil/helpers.go
+++ b/x/mint/client/testutil/helpers.go
@@ -3,11 +3,12 @@ package testutil
 import (
 	"fmt"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/cosmos/cosmos-sdk/tests"
 	"github.com/cosmos/cosmos-sdk/tests/cli"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/mint/types"
-	"github.com/stretchr/testify/require"
 )
 
 // QueryMintingParams returns the current minting parameters