More conformance to PEP8.