[DF-3327] refactoring according review