Classic refactoring.