332 Refactoring