ENG-4220 addressed Izzy's code review comments (Take Two)