VID-1976 responding to more code review feedback