code review - Updated comments