1438 Refactoring