1472 Refactoring