Expand and tidy grammar