Refactoring is so much fun, get outta here