5854: Refactoring