679 Refactoring