VID-1801 Code review changes