[DF-962] small refactoring