Few more pep8 cleanups.