Address feedback from review.