Apply wording improvements suggested by Jonathan