Waaaaaaayyyy too many changes to log, but most

are PEP8 conformity and code cleanup that should have never been written
that way (I didn't understand the format method when I wrote these.)
Whoops! I broke it!