Rearranged the helpers to make more consistent