882 Refactoring