Design refactoring.