Incorporate helpers to clean up code