Fix/setup

Just some minor cleanups in the setup.py