More PEP8-ificiation