Clean up files, add comments
Fixup line spacing
More cleanup
Update grammar file
Actually update grammar file