More pylint corrections