pyflakes / pep8 improvements