VE-1639: Addressing code styling issues