ENG-6037 addressed code review comments