tidying and changing time to timetz