Apply PR's comments.