Made date formatting consistent