More Pylint fixes...
Even more Pylint fixes...