Improve number and date format