VID-1821 code review changes