Cleaning up some of the helpers