ENG-6837 code review changes