refactoring feels awesome