Loads of PEP8 clean up