Require helpers from features folder
Incorporate helpers to clean up code
Add helper I missed