Cleaned up the date formatting