Refactor some PEP8 errors