Adding more lexer tokens
Attempting to simplify lexer