pep8 changes.
pep8, pyflakes fixes.