423 Refactoring