Add helper & refactor
Add reminder comments to helper