Tidy up setup.py