More Pylint Changes