refactoring, baby