Cleanup to make pylint happy