VID-1920 responding to code review feedback