Client code refactoring.