Tidied up setup.py