VE-1207: Code review feedback