Make grammar more consistent/