[DF-3732] small refactor