Editorial changes to be more PEP-8 compliant.