Better wording and cleaner look