clean up
Move token defination in grammar.y