Modify the code and comment in English