803 Refactoring