Some tweaks to the coding style.

Also grammars