more pep8/pylint fixes