US05: Modify comments according code review notes