Good refactoring.