ENG-6388 more code review changes