VID-1985 code review changes