Several changes to language to make it more clear