Changes due to code review.