Better date formatting handling

Why ?