Grammar changes

Small grammar improvements
Minor usages of identifier markdown styles