Preparing for pypi releasing, small refactoring.