Nicer setup.py
Cleanup