PR review cleanup