Further PEP8 changes