Refactoring (2)