Clean up some PEP8 stuff