#1494

Pull the time formatting out into a helper