VE-1511 Code review changes