Reduced pylint warnings