pep 8 & pyflakes cleanup