Refactor ALL THE THINGS!
Moar refactoring.