Reformat and cleanup grammar.y