Fixed some PEP8 violations and other minor stuff