More pylint readability changes.