785 Refactoring