[improvements] Fix some points, notified for the pull request