VID-1308 responding to code review feedback