Clean up some PEP8 issues