Tidied up the date formatting