VE-1485: Code review feedback