diff --git a/.changeset/kind-brooms-admire.md b/.changeset/kind-brooms-admire.md
new file mode 100644
index 0000000..4f56442
--- /dev/null
+++ b/.changeset/kind-brooms-admire.md
@@ -0,0 +1,5 @@
+---
+"@cloudwalker/react-inspect": patch
+---
+
+Convert all internal components to function components
diff --git a/packages/react-inspect/src/components/DataHandler/DataHandler.tsx b/packages/react-inspect/src/components/DataHandler/DataHandler.tsx
index 6143ab8..051911b 100644
--- a/packages/react-inspect/src/components/DataHandler/DataHandler.tsx
+++ b/packages/react-inspect/src/components/DataHandler/DataHandler.tsx
@@ -1,114 +1,101 @@
-import {Component} from 'react'
-
 import {CollapseHandler} from '../CollapseHandler'
 import {Key} from '../Key'
 import {Level} from '../Level'
 import {Punctuation} from '../Punctuation'
 import {Value} from '../Value'
 
-export class DataHandler extends Component<{
-  theme?: 'gloom' | 'default'
+export function DataHandler({
+  data,
+  outer = false,
+  theme = 'default',
+}: {
   data: unknown
-  outer: boolean
-}> {
-  static displayName = 'ReactInspectDataHandler'
-  static defaultProps = {
-    outer: false,
+  outer?: boolean
+  theme?: 'gloom' | 'default'
+}) {
+  if (typeof data == 'string') {
+    return <Value type="string" theme={theme}>{`"${data}"`}</Value>
   }
 
-  render() {
-    const {data, outer, theme = 'default'} = this.props
-
-    if (typeof data == 'string') {
-      return <Value type="string" theme={theme}>{`"${data}"`}</Value>
-    }
-
-    if (typeof data == 'number') {
-      return <Value type="number" theme={theme}>{`${data}`}</Value>
-    }
-
-    if (typeof data == 'function') {
-      const value = (
-        <Value type="function" theme={theme}>
-          {String(data).trim()}
-        </Value>
-      )
+  if (typeof data == 'number') {
+    return <Value type="number" theme={theme}>{`${data}`}</Value>
+  }
 
-      if (outer) {
-        return value
-      }
+  if (typeof data == 'function') {
+    const value = (
+      <Value type="function" theme={theme}>
+        {String(data).trim()}
+      </Value>
+    )
 
-      return (
-        <CollapseHandler>
-          {(show) =>
-            show ? value : {...value, props: {...value.props, children: 'fn'}}
-          }
-        </CollapseHandler>
-      )
+    if (outer) {
+      return value
     }
 
-    if (Array.isArray(data)) {
-      const value = data.map((x, i) => (
-        <Level key={i}>
-          <DataHandler data={x} theme={theme} />
-        </Level>
-      ))
+    return (
+      <CollapseHandler>
+        {(show) =>
+          show ? value : {...value, props: {...value.props, children: 'fn'}}
+        }
+      </CollapseHandler>
+    )
+  }
 
-      return (
-        <span>
-          <Punctuation theme={theme}>{'['}</Punctuation>
-          {outer ? (
-            value
-          ) : (
-            <CollapseHandler>
-              {(show) =>
-                show ? (
-                  <>{value}</>
-                ) : (
-                  <Punctuation theme={theme}>...</Punctuation>
-                )
-              }
-            </CollapseHandler>
-          )}
-          <Punctuation theme={theme}>{']'}</Punctuation>
-        </span>
-      )
-    }
+  if (Array.isArray(data)) {
+    const value = data.map((x, i) => (
+      <Level key={i}>
+        <DataHandler data={x} theme={theme} />
+      </Level>
+    ))
 
-    if (isRecord(data)) {
-      const value = Object.keys(data).map((x) => (
-        <Level key={x}>
-          <Key theme={theme}>{x}</Key>
-          <Punctuation theme={theme}>:</Punctuation>{' '}
-          <DataHandler data={data[x]} theme={theme} />
-        </Level>
-      ))
+    return (
+      <span>
+        <Punctuation theme={theme}>{'['}</Punctuation>
+        {outer ? (
+          value
+        ) : (
+          <CollapseHandler>
+            {(show) =>
+              show ? <>{value}</> : <Punctuation theme={theme}>...</Punctuation>
+            }
+          </CollapseHandler>
+        )}
+        <Punctuation theme={theme}>{']'}</Punctuation>
+      </span>
+    )
+  }
 
-      return (
-        <span>
-          <Punctuation theme={theme}>{'{'}</Punctuation>
-          {outer ? (
-            value
-          ) : (
-            <CollapseHandler>
-              {(show) =>
-                show ? (
-                  <>{value}</>
-                ) : (
-                  <Punctuation theme={theme}>...</Punctuation>
-                )
-              }
-            </CollapseHandler>
-          )}
-          <Punctuation theme={theme}>{'}'}</Punctuation>
-        </span>
-      )
-    }
+  if (isRecord(data)) {
+    const value = Object.keys(data).map((x) => (
+      <Level key={x}>
+        <Key theme={theme}>{x}</Key>
+        <Punctuation theme={theme}>:</Punctuation>{' '}
+        <DataHandler data={data[x]} theme={theme} />
+      </Level>
+    ))
 
-    return <Value type="keyword" theme={theme}>{`${data}`}</Value>
+    return (
+      <span>
+        <Punctuation theme={theme}>{'{'}</Punctuation>
+        {outer ? (
+          value
+        ) : (
+          <CollapseHandler>
+            {(show) =>
+              show ? <>{value}</> : <Punctuation theme={theme}>...</Punctuation>
+            }
+          </CollapseHandler>
+        )}
+        <Punctuation theme={theme}>{'}'}</Punctuation>
+      </span>
+    )
   }
+
+  return <Value type="keyword" theme={theme}>{`${data}`}</Value>
 }
 
+DataHandler.displayName = 'ReactInspectDataHandler'
+
 function isRecord(data: unknown): data is Record<string, unknown> {
   return data != null && typeof data == 'object'
 }
diff --git a/packages/react-inspect/src/main.ts b/packages/react-inspect/src/main.ts
index 883151c..50c3ce3 100644
--- a/packages/react-inspect/src/main.ts
+++ b/packages/react-inspect/src/main.ts
@@ -1 +1 @@
-export {Inspect} from './components/ReactInspect'
+export {Inspect} from './components/Inspect'