More PEP8ing