Fix pylint/pep8 errors