Lotsa PEP8 changes