Better format for times - This should be just about prod-ready.