Decoupled the formatter from the evaluator
Added some more built in punctuation names