Change wording based on Bram's suggestions