fix some reviewers comments