Some whitespacey bits
Tabs to spaces
More minor whitespacey bits
One spot newer than scott's changes which prob needed a py3-ism