Switch to more generic time formatting