523 Refactoring