606 Refactoring