More PEP8-ificiation 2