VE-1558 Code review feedback