Further PEP8 work.