Update after code review.