Some more tidying up and time format change