Aethetic changes suggested by pylint.