Refactor ALL the things!