Cleaning up for PyPI install