First pass at trying to make pylint happy