Fixed some PEP8 violations;