Refactored SOME of the things