Nice refactoring.