Simplify returning of text() in the grammar
Handle capitalized week day names
Formatting