remove TK_ prefix from tokens and update main