VE-690 Addressing code review feedback