Fixing some PEP-8 issues