Bring up to PEP8