VID-1773 Code review changes