PEP8 fixes all over the place.