pylint: more fixes