PR review: review cleanup round 3