Minor cleanup pre-PullRequest