diff --git a/core/vm/contracts_write.go b/core/vm/contracts_write.go
index 7c506ceb8..50b3d92ce 100644
--- a/core/vm/contracts_write.go
+++ b/core/vm/contracts_write.go
@@ -2,6 +2,7 @@ package vm
 
 import (
 	"errors"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/harmony-one/harmony/shard"
diff --git a/core/vm/int_pool_verifier.go b/core/vm/int_pool_verifier.go
index 82fbfed69..c2382b189 100644
--- a/core/vm/int_pool_verifier.go
+++ b/core/vm/int_pool_verifier.go
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
+//go:build VERIFY_EVM_INTEGER_POOL
 // +build VERIFY_EVM_INTEGER_POOL
 
 package vm
diff --git a/core/vm/int_pool_verifier_empty.go b/core/vm/int_pool_verifier_empty.go
index a5f1dc02b..6f7ff5759 100644
--- a/core/vm/int_pool_verifier_empty.go
+++ b/core/vm/int_pool_verifier_empty.go
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
+//go:build !VERIFY_EVM_INTEGER_POOL
 // +build !VERIFY_EVM_INTEGER_POOL
 
 package vm
diff --git a/core/vm/runtime/fuzz.go b/core/vm/runtime/fuzz.go
index cb9ff08b5..d20a784e1 100644
--- a/core/vm/runtime/fuzz.go
+++ b/core/vm/runtime/fuzz.go
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
+//go:build gofuzz
 // +build gofuzz
 
 package runtime
diff --git a/hmy/tracers/rosetta_block_tracer.go b/hmy/tracers/rosetta_block_tracer.go
index fd6e37d53..61f71a755 100644
--- a/hmy/tracers/rosetta_block_tracer.go
+++ b/hmy/tracers/rosetta_block_tracer.go
@@ -17,8 +17,9 @@
 package tracers
 
 import (
-	"github.com/harmony-one/harmony/core/vm"
 	"math/big"
+
+	"github.com/harmony-one/harmony/core/vm"
 )
 
 type RosettaLogItem struct {
diff --git a/rosetta/services/account.go b/rosetta/services/account.go
index 0cbd6afeb..61fc9111c 100644
--- a/rosetta/services/account.go
+++ b/rosetta/services/account.go
@@ -3,9 +3,10 @@ package services
 import (
 	"context"
 	"fmt"
-	"github.com/harmony-one/harmony/core/vm"
 	"math/big"
 
+	"github.com/harmony-one/harmony/core/vm"
+
 	"github.com/coinbase/rosetta-sdk-go/server"
 	"github.com/coinbase/rosetta-sdk-go/types"
 	ethCommon "github.com/ethereum/go-ethereum/common"
diff --git a/rosetta/services/block.go b/rosetta/services/block.go
index 436cf4b43..e9eece2a6 100644
--- a/rosetta/services/block.go
+++ b/rosetta/services/block.go
@@ -3,11 +3,12 @@ package services
 import (
 	"context"
 	"fmt"
-	"github.com/harmony-one/harmony/hmy/tracers"
 	"math/big"
 	"sync"
 	"time"
 
+	"github.com/harmony-one/harmony/hmy/tracers"
+
 	"github.com/harmony-one/harmony/core"
 	"github.com/harmony-one/harmony/core/state"
 	coreTypes "github.com/harmony-one/harmony/core/types"
diff --git a/rosetta/services/tx_format.go b/rosetta/services/tx_format.go
index 1961bdabd..4cfb78237 100644
--- a/rosetta/services/tx_format.go
+++ b/rosetta/services/tx_format.go
@@ -3,9 +3,10 @@ package services
 import (
 	"encoding/hex"
 	"fmt"
-	"github.com/harmony-one/harmony/hmy/tracers"
 	"math/big"
 
+	"github.com/harmony-one/harmony/hmy/tracers"
+
 	"github.com/coinbase/rosetta-sdk-go/types"
 	ethcommon "github.com/ethereum/go-ethereum/common"
 
diff --git a/rosetta/services/tx_operation.go b/rosetta/services/tx_operation.go
index dd1a466da..8a1515e2e 100644
--- a/rosetta/services/tx_operation.go
+++ b/rosetta/services/tx_operation.go
@@ -1,9 +1,10 @@
 package services
 
 import (
-	"github.com/harmony-one/harmony/hmy/tracers"
 	"math/big"
 
+	"github.com/harmony-one/harmony/hmy/tracers"
+
 	"github.com/harmony-one/harmony/internal/bech32"
 	internalCommon "github.com/harmony-one/harmony/internal/common"
 
diff --git a/rosetta/services/tx_operation_test.go b/rosetta/services/tx_operation_test.go
index 2d881f2d2..3f56dc0b6 100644
--- a/rosetta/services/tx_operation_test.go
+++ b/rosetta/services/tx_operation_test.go
@@ -3,11 +3,12 @@ package services
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/harmony-one/harmony/hmy/tracers"
 	"math/big"
 	"reflect"
 	"testing"
 
+	"github.com/harmony-one/harmony/hmy/tracers"
+
 	"github.com/coinbase/rosetta-sdk-go/types"
 	ethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"