Refactoring in progress ... (2)