pyflake related cleanup
pyflakes cleanup