Better wording and assertions