Do some pep8 fixes.