Formatting fixes in Grammar

Noticed some changes in #69 were not replicated in the grammar file.

Wasn't sure exactly how to fit in the string variable substitution part but i'll probably address that soon.