PyLint fixes.
Fix pylint errors