PEP8 fixups