Minor Pylint-driven improvements