pep8 & pyflakes fixes