Simplification of lexer to just do math