Minor changes suggested by pylint