fix some problem about code review.