Clean-up to make PyLint happy