Refactor all the things!