pyflakes
more cleanup