Cleanup in preparation for PyPI submission