Move time format to top level?