Used reindent.py to fix crappy indentation