More PEP8 stuff