PEP8-ed
More PEP8ing