pep8 and pyflakes
minor cleanup
more cleanup