[DF-5048] refactoring