Removed TODO whose point I've forgotten
Extracted escapeDate