More PEP8 exclusions; lots of PEP8 clean-up