Refactored some code, working on making code more consistent for future utilities