clean up token types etc.
grammar cleanup