Improved PEP 8 conformance.