Refactoring all the things