Cleanup of calculate
Simplification of lexer to just do math