706 Refactoring