Grammar pass

[ci skip]

Add improvements from @eileencodes [skip ci]