diff --git a/trie/bintrie/iterator_test.go b/trie/bintrie/iterator_test.go
index 15147fe3b1..9ba8acdbf5 100644
--- a/trie/bintrie/iterator_test.go
+++ b/trie/bintrie/iterator_test.go
@@ -29,8 +29,8 @@ func makeTrie(t *testing.T, entries [][2]common.Hash) *BinaryTrie {
 	t.Helper()
 	store := NewNodeStore()
 	tr := &BinaryTrie{
-		store:      store,
-		tracer:     trie.NewPrevalueTracer(),
+		store:  store,
+		tracer: trie.NewPrevalueTracer(),
 	}
 	for _, kv := range entries {
 		if err := store.Insert(kv[0][:], kv[1][:], nil); err != nil {
@@ -63,8 +63,8 @@ func countLeaves(t *testing.T, tr *BinaryTrie) int {
 // no nodes and reports no error.
 func TestIteratorEmptyTrie(t *testing.T) {
 	tr := &BinaryTrie{
-		store:      NewNodeStore(),
-		tracer:     trie.NewPrevalueTracer(),
+		store:  NewNodeStore(),
+		tracer: trie.NewPrevalueTracer(),
 	}
 	it, err := newBinaryNodeIterator(tr, nil)
 	if err != nil {
diff --git a/trie/bintrie/node_ref.go b/trie/bintrie/node_ref.go
index 5341d33714..b21abd2826 100644
--- a/trie/bintrie/node_ref.go
+++ b/trie/bintrie/node_ref.go
@@ -20,9 +20,9 @@ package bintrie
 type NodeKind uint8
 
 const (
-	KindEmpty    NodeKind = iota
+	KindEmpty NodeKind = iota
 	KindInternal
-	KindStem     // up to 256 values per stem
+	KindStem // up to 256 values per stem
 	KindHashed
 )
 
diff --git a/trie/bintrie/trie.go b/trie/bintrie/trie.go
index 112a18b561..6964a479a7 100644
--- a/trie/bintrie/trie.go
+++ b/trie/bintrie/trie.go
@@ -174,9 +174,9 @@ func (t *BinaryTrie) GetWithHashedKey(key []byte) ([]byte, error) {
 // GetAccount returns the account information for the given address.
 func (t *BinaryTrie) GetAccount(addr common.Address) (*types.StateAccount, error) {
 	var (
-		err    error
-		acc    = &types.StateAccount{}
-		key    = GetBinaryTreeKey(addr, zero[:])
+		err error
+		acc = &types.StateAccount{}
+		key = GetBinaryTreeKey(addr, zero[:])
 	)
 
 	values, err := t.store.GetValuesAtStem(key[:StemSize], t.nodeResolver)
diff --git a/trie/bintrie/trie_test.go b/trie/bintrie/trie_test.go
index cc0c2b4fd6..a122b2d152 100644
--- a/trie/bintrie/trie_test.go
+++ b/trie/bintrie/trie_test.go
@@ -188,8 +188,8 @@ func TestMerkleizeMultipleEntries(t *testing.T) {
 func TestStorageRoundTrip(t *testing.T) {
 	tracer := trie.NewPrevalueTracer()
 	tr := &BinaryTrie{
-		store:      NewNodeStore(),
-		tracer:     tracer,
+		store:  NewNodeStore(),
+		tracer: tracer,
 	}
 	addr := common.HexToAddress("0x1234567890abcdef1234567890abcdef12345678")
 
@@ -256,8 +256,8 @@ func TestStorageRoundTrip(t *testing.T) {
 func newEmptyTestTrie(t *testing.T) *BinaryTrie {
 	t.Helper()
 	return &BinaryTrie{
-		store:      NewNodeStore(),
-		tracer:     trie.NewPrevalueTracer(),
+		store:  NewNodeStore(),
+		tracer: trie.NewPrevalueTracer(),
 	}
 }
 
@@ -581,8 +581,8 @@ func TestBinaryTrieWitness(t *testing.T) {
 	tracer := trie.NewPrevalueTracer()
 
 	tr := &BinaryTrie{
-		store:      NewNodeStore(),
-		tracer:     tracer,
+		store:  NewNodeStore(),
+		tracer: tracer,
 	}
 	if w := tr.Witness(); len(w) != 0 {
 		t.Fatal("expected empty witness for fresh trie")
@@ -608,8 +608,8 @@ func TestBinaryTrieWitness(t *testing.T) {
 func testAccount(t *testing.T, addr common.Address, nonce uint64, balance uint64) *BinaryTrie {
 	t.Helper()
 	tr := &BinaryTrie{
-		store:      NewNodeStore(),
-		tracer:     trie.NewPrevalueTracer(),
+		store:  NewNodeStore(),
+		tracer: trie.NewPrevalueTracer(),
 	}
 	acc := &types.StateAccount{
 		Nonce:    nonce,
@@ -662,8 +662,8 @@ func TestGetAccountNonMembershipStemRoot(t *testing.T) {
 // address returns nil when the trie root is an InternalNode (multi-account trie).
 func TestGetAccountNonMembershipInternalRoot(t *testing.T) {
 	tr := &BinaryTrie{
-		store:      NewNodeStore(),
-		tracer:     trie.NewPrevalueTracer(),
+		store:  NewNodeStore(),
+		tracer: trie.NewPrevalueTracer(),
 	}
 
 	// Insert two accounts whose binary tree keys have different first bits
@@ -725,8 +725,8 @@ func TestGetStorageNonMembershipStemRoot(t *testing.T) {
 // non-existent address returns nil when the root is an InternalNode.
 func TestGetStorageNonMembershipInternalRoot(t *testing.T) {
 	tr := &BinaryTrie{
-		store:      NewNodeStore(),
-		tracer:     trie.NewPrevalueTracer(),
+		store:  NewNodeStore(),
+		tracer: trie.NewPrevalueTracer(),
 	}
 
 	addr := common.HexToAddress("0x1234567890abcdef1234567890abcdef12345678")