Improve rule wording and order