Fixed formatting of date and time