Refactor ALL the things