fixed the comments of Daniel's code review