Pylint/pep8 cleanups