Small changes made after code review.