Update according to code reviews.