Successful refactoring