VE-1425: Addressing code review feedback