Large PEP8 changes.