924 Refactoring