ENG-5741: comments and typos