Adding numexpr
Cleanup
Omitting tags for the token counting