* grammar cleanup