VE-1024: Code review feedback