Refactoring the Interface