Correct and modify

* All changes obeys the reviewer.