pep8/pylint fixes