Changes after code review.