diff --git a/store/database.go b/store/database.go
index 2df28059a4..1975b2af38 100644
--- a/store/database.go
+++ b/store/database.go
@@ -3,8 +3,9 @@ package store
 import (
 	"io"
 
-	corestore "cosmossdk.io/core/store"
 	ics23 "github.com/cosmos/ics23/go"
+
+	corestore "cosmossdk.io/core/store"
 )
 
 // Reader wraps the Has and Get method of a backing data store.
diff --git a/store/proof.go b/store/proof.go
index cabeb5c680..58a46236d9 100644
--- a/store/proof.go
+++ b/store/proof.go
@@ -163,7 +163,7 @@ func ProofFromByteSlices(leaves [][]byte, index int) (rootHash []byte, inners []
 		// saved until the next iteration).
 		if index < n-1 || index&1 == 1 {
 			inner := &ics23.InnerOp{Hash: ics23.HashOp_SHA256}
-			//If proof index is even then child is from left, suffix is populated
+			// If proof index is even then child is from left, suffix is populated
 			// otherwise, child is from right and the prefix is populated.
 			if index&1 == 0 {
 				// inner op(prefix=0x01 | child | suffix=leaves[index+1])
@@ -190,7 +190,7 @@ func ProofFromByteSlices(leaves [][]byte, index int) (rootHash []byte, inners []
 	}
 
 	rootHash = leaves[0]
-	return
+	return rootHash, inners
 }
 
 // ConvertCommitmentOp converts the given merkle proof into an CommitmentOp.
diff --git a/store/storage/pebbledb/iterator.go b/store/storage/pebbledb/iterator.go
index abb746863d..6bd60a2cfe 100644
--- a/store/storage/pebbledb/iterator.go
+++ b/store/storage/pebbledb/iterator.go
@@ -180,7 +180,6 @@ func (itr *iterator) Next() {
 	}
 
 	itr.valid = false
-	return
 }
 
 func (itr *iterator) Valid() bool {
diff --git a/store/storage/sqlite/iterator.go b/store/storage/sqlite/iterator.go
index 4549c478fa..e048e1f3cd 100644
--- a/store/storage/sqlite/iterator.go
+++ b/store/storage/sqlite/iterator.go
@@ -152,7 +152,6 @@ func (itr *iterator) Next() {
 	}
 
 	itr.valid = false
-	return
 }
 
 func (itr *iterator) Error() error {