a slight refactor to clean up on helpers are created