Updated better date formatting