972 Refactoring