41 Refactoring