some cleanup, pypi packaging