769 Refactoring