Fix setup.py to work with new changes
Clean up draw.py
Formatting prefix