Do some pep8 fixes.
Work in progress...