pep8 compliant
Revert "pep8 compliant"

This reverts commit 2e077064fcb429b7e5d625cf23d44dc22911b83f.
Converted some files PEP8 to remove PEP8bot failure