Converted some files to PEP compliant to remove PEPbot errors