Incorporating comments from code review.