PEP8 changes, ignoring E501 of course.