VE-1516: Code review feedback