VE-690 Code review feedback