Major refactoring cleaner now thou