Made the grammar more consistent