612 Refactoring