Fixed some PEP8 and other formatting stuff