Fix some PEP-8 formatting problems