Improvements from code review.