Improved pylint compliance.