diff --git a/cschwabpy/models/__init__.py b/cschwabpy/models/__init__.py
index c2a8bee..3b73c15 100644
--- a/cschwabpy/models/__init__.py
+++ b/cschwabpy/models/__init__.py
@@ -315,8 +315,8 @@ def to_dataframe_row(self, strip_space: bool = False) -> List[Any]:
             self.openInterest,
             self.ask,
             self.bid,
-            self.expirationDate,
-            util.ts_to_date_string(self.quoteTimeInLong),
+            self.expirationDate[: self.expirationDate.index("T")],
+            util.ts_to_datetime(self.quoteTimeInLong),
             self.totalVolume,
             self.quoteTimeInLong,  # updated_at
             self.gamma,