Cleanup to prepare for PYPI