Minor improvements to grammar