Resolve PAReview comments