A lot of PEP8 related changes.