Tidied up ready for upload to PyPi