Lots of PEP8'ing