diff --git a/src/table.lisp b/src/table.lisp
index b08be13..eea5045 100644
--- a/src/table.lisp
+++ b/src/table.lisp
@@ -4,17 +4,17 @@
 
 (in-package :ml-sbt/tbl)
 
-(defun escape-cell-content (content)
-  (cond ((numberp content) (format nil "~,9f" content))
-        ((stringp content) (spinneret:escape-string content))
-        (t (spinneret:escape-string (princ-to-string content)))))
+(defun format-cell-content (content)
+  (if (numberp content)
+      (format nil "~,9f" content)
+      content))
 
 (defun render-table-header (headers)
   (spinneret:with-html
     (:thead
       (:tr
         (loop for header in headers
-              do (:th :scope "col" (:raw (escape-cell-content header))))))))
+              do (:th :scope "col" (format-cell-content header)))))))
 
 (defun render-table-body (rows)
   (spinneret:with-html
@@ -22,7 +22,7 @@
       (loop for row in rows
             do (:tr
                  (loop for cell in row
-                       do (:td (:raw (escape-cell-content cell)))))))))
+                       do (:td (escape-cell-content cell))))))))
 
 (defun render-table (headers rows &key (class "table"))
   (spinneret:with-html