Pylint/pyflakes cleanup