PEP8 tidy up for several modules

Harmless PEP8 fixes :smile: