ENG-7207 more code review changes