Put in some feedback from the code review.