fix according comments in pull request