Lots of minor PEP8 fixes.