Fixing some PEP8 issues