324 Refactoring