More pylint cleanups