DM-23 Refactoring