790 Refactoring