Ended enhanced refactoring.