refactoring again to pypi better