More PEP8 fixing