VID-1976 responding to code review feedback