Better PEP8 conformance.