More tidying up of the setup.py