ENG-5043 addressed Ariel's code review comments (take II)