Address comments for PR review.