make this more consistent with hapi style and more consistent throughout the exercises