PEP8 fixups

This tidies up some PEP8 warnings.