886 Refactoring