changes from code review.