clean up the PR a bit