refactor ALL the things!