VE-566 responding to code review feedback