Grammar clean-up