diff --git a/node/client.go b/node/client.go
index 11756c7..a5d625e 100644
--- a/node/client.go
+++ b/node/client.go
@@ -62,7 +62,7 @@ func (p *clientProvider) getOrRegisterGroup(group Group) *util.ConcurrentMap {
 	return v.(*util.ConcurrentMap)
 }
 
-// getRouteGroup get custom route group for specific route key
+// GetRouteGroup get custom route group for specific route key
 func (p *clientProvider) GetRouteGroup(key string) (grp Group, ok bool) {
 	if p.db == nil { // db not available
 		return grp, false
diff --git a/store/mysql/store_log_big_contract.go b/store/mysql/store_log_big_contract.go
index 447dfaa..af7a5d6 100644
--- a/store/mysql/store_log_big_contract.go
+++ b/store/mysql/store_log_big_contract.go
@@ -59,7 +59,7 @@ func newBigContractLogStore(
 	}
 }
 
-// preparePartition create new contract log partitions for the big contract if necessary.
+// preparePartitions create new contract log partitions for the big contract if necessary.
 // Also migrates event logs from address indexed table to separate contract specified log table
 // for the initial partitioning.
 func (bcls *bigContractLogStore) preparePartitions(dataSlice []*store.EpochData) (map[uint64]bnPartition, error) {
diff --git a/store/mysql/store_map_epoch_block.go b/store/mysql/store_map_epoch_block.go
index 63ff826..b7b25c8 100644
--- a/store/mysql/store_map_epoch_block.go
+++ b/store/mysql/store_map_epoch_block.go
@@ -114,7 +114,7 @@ func (e2bms *epochBlockMapStore) MaxEpoch() (uint64, bool, error) {
 	return uint64(maxEpoch.Int64), true, nil
 }
 
-// blockRange returns the spanning block range for the give epoch.
+// BlockRange returns the spanning block range for the give epoch.
 func (e2bms *epochBlockMapStore) BlockRange(epoch uint64) (citypes.RangeUint64, bool, error) {
 	var e2bmap epochBlockMap
 	var bnr citypes.RangeUint64
diff --git a/util/blockchain.go b/util/blockchain.go
index a795f3c..a9fb435 100644
--- a/util/blockchain.go
+++ b/util/blockchain.go
@@ -60,7 +60,7 @@ func GetSummaryOfBlock(block *types.Block) *types.BlockSummary {
 	return &summary
 }
 
-// StripLogExtraFields strips extra unnecessary fields from logs to comply with fullnode rpc
+// StripLogExtraFieldsForRPC strips extra unnecessary fields from logs to comply with fullnode rpc
 func StripLogExtraFieldsForRPC(logs []types.Log) {
 	for i := 0; i < len(logs); i++ {
 		log := &logs[i]
diff --git a/virtualfilter/chain.go b/virtualfilter/chain.go
index 49375eb..a99416b 100644
--- a/virtualfilter/chain.go
+++ b/virtualfilter/chain.go
@@ -24,7 +24,7 @@ type filterCursor struct {
 type filterChainIterator func(node *filterNode, forkPoint bool) bool
 
 type filterChain interface {
-	// snapshots filter cursor of the latest node
+	// snapshotLatestCursor filter cursor of the latest node
 	snapshotLatestCursor() filterCursor
 	// check if node is on the chain
 	hasNode(node *filterNode) bool