Fixed some PEP errors that PyCharm has been complaining about