Cleanup and preparation for pull request