Address some Pylint violations