VID-2138 code review changes