PEP-8ization complete