Fix some issues found by pep8 and pyflakes