VE-1199: Code review feedback