Corrected some feedback from code review.