Minor clean-ups
Fix pep8/pyflakes