addressed commitcomment-3599339 code review notes
addressed commitcomment-3599591 code review notes