More PyLint cleanup