More closely conform to PEP8.