Update based on feedback from code review.