ENG-6280 addresed Ariel's code review comments