Pylint improvement and method rename