VID-320 responding to code review