[DF-517] small refactoring for VS