Change Terminator token to ; only. No more newline.

It is simpler to strip all newlines and use semi-colons as terminator
token