some easy changes to make pylint less unhappy