Worked on better lex file