5824: Refactoring