Object-oriented refactoring.