VID-792 Updates addressing code review suggetions