VID-1897 code review changes