Cleanup for Pull Request