Updated code review.