Move dateFormat into its own module