Made a few changes to clean up code and make it consistent in preparation for the merge