diff --git a/x/claim/keeper/grpc_query_airdrop_supply_test.go b/x/claim/keeper/grpc_query_airdrop_supply_test.go
index 5ebc3404d..6e4be7a38 100644
--- a/x/claim/keeper/grpc_query_airdrop_supply_test.go
+++ b/x/claim/keeper/grpc_query_airdrop_supply_test.go
@@ -1,7 +1,6 @@
 package keeper_test
 
 import (
-	"github.com/tendermint/spn/testutil/sample"
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -11,14 +10,16 @@ import (
 
 	testkeeper "github.com/tendermint/spn/testutil/keeper"
 	"github.com/tendermint/spn/testutil/nullify"
+	"github.com/tendermint/spn/testutil/sample"
 	"github.com/tendermint/spn/x/claim/types"
 )
 
 func TestAirdropSupplyQuery(t *testing.T) {
-	ctx, tk, _ := testkeeper.NewTestSetup(t)
-
-	wctx := sdk.WrapSDKContext(ctx)
-	sampleSupply := sample.Coin(r)
+	var (
+		ctx, tk, _   = testkeeper.NewTestSetup(t)
+		wctx         = sdk.WrapSDKContext(ctx)
+		sampleSupply = sample.Coin(r)
+	)
 	tk.ClaimKeeper.SetAirdropSupply(ctx, sampleSupply)
 
 	for _, tc := range []struct {
diff --git a/x/claim/keeper/grpc_query_claim_record_test.go b/x/claim/keeper/grpc_query_claim_record_test.go
index 4c09ee9c5..fcfa50d69 100644
--- a/x/claim/keeper/grpc_query_claim_record_test.go
+++ b/x/claim/keeper/grpc_query_claim_record_test.go
@@ -16,10 +16,12 @@ import (
 )
 
 func TestClaimRecordQuerySingle(t *testing.T) {
-	ctx, tk, _ := testkeeper.NewTestSetup(t)
+	var (
+		ctx, tk, _ = testkeeper.NewTestSetup(t)
+		wctx       = sdk.WrapSDKContext(ctx)
+		msgs       = createNClaimRecord(tk.ClaimKeeper, ctx, 2)
+	)
 
-	wctx := sdk.WrapSDKContext(ctx)
-	msgs := createNClaimRecord(tk.ClaimKeeper, ctx, 2)
 	for _, tc := range []struct {
 		desc     string
 		request  *types.QueryGetClaimRecordRequest
@@ -68,10 +70,11 @@ func TestClaimRecordQuerySingle(t *testing.T) {
 }
 
 func TestClaimRecordQueryPaginated(t *testing.T) {
-	ctx, tk, _ := testkeeper.NewTestSetup(t)
-
-	wctx := sdk.WrapSDKContext(ctx)
-	msgs := createNClaimRecord(tk.ClaimKeeper, ctx, 5)
+	var (
+		ctx, tk, _ = testkeeper.NewTestSetup(t)
+		wctx       = sdk.WrapSDKContext(ctx)
+		msgs       = createNClaimRecord(tk.ClaimKeeper, ctx, 5)
+	)
 
 	request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllClaimRecordRequest {
 		return &types.QueryAllClaimRecordRequest{
diff --git a/x/claim/keeper/mission.go b/x/claim/keeper/mission.go
index d7dd2d7d5..9f2943fb9 100644
--- a/x/claim/keeper/mission.go
+++ b/x/claim/keeper/mission.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	spnerrors "github.com/tendermint/spn/pkg/errors"
 	"github.com/tendermint/spn/x/claim/types"
 )