More PyLint cleanups