Cleaned up a bit and fixed setup.py