Refactor all of the things!