Fix some PEP8 issues