Lots of PEP8 improvements