A lot of PEP8 improvements.