Some grammar-related imprevements

Change-Id: I2dcb94fa0ffaea2117c05c4dac123b7a420238cd