Minor changes before submission to pypi