added formatting for date and time