diff --git a/src/app/(stats)/player/[ign]/_stats/duels/duels.tsx b/src/app/(stats)/player/[ign]/_stats/duels/duels.tsx
index 665540b..a7989ad 100644
--- a/src/app/(stats)/player/[ign]/_stats/duels/duels.tsx
+++ b/src/app/(stats)/player/[ign]/_stats/duels/duels.tsx
@@ -69,7 +69,7 @@ export default function DuelsStats({ stats }: { stats: NonNullStats["Duels"] })
                     </AccordionTrigger>
                     <AccordionContent>
                         <Separator className="my-4" />
-                        <DuelsGeneralStats statsChecked={stats} div={div} kd={kd} wl={wl} />
+                        <DuelsGeneralStats stats={stats} div={div} kd={kd} wl={wl} />
                         <Separator className="my-4" />
                         <DuelsStatsTable stats={stats} />
                     </AccordionContent>
diff --git a/src/app/(stats)/player/[ign]/_stats/duels/stats.tsx b/src/app/(stats)/player/[ign]/_stats/duels/stats.tsx
index af26c1c..83e7c25 100644
--- a/src/app/(stats)/player/[ign]/_stats/duels/stats.tsx
+++ b/src/app/(stats)/player/[ign]/_stats/duels/stats.tsx
@@ -6,10 +6,8 @@ import { cn } from "@/lib/utils"
 import { BasicStat } from "../../_components/Stats"
 
 export default function DuelsGeneralStats(
-    { statsChecked, div, kd, wl }: { statsChecked: NonNullStats["Duels"], div: Div | null, kd: string, wl: string }
+    { stats, div, kd, wl }: { stats: NonNullable<NonNullStats["Duels"]>, div: Div | null, kd: string, wl: string }
 ) {
-    const stats = statsChecked!
-
     return (
         <div className="flex mb-10">
             <div className="flex-1">
diff --git a/src/app/(stats)/player/[ign]/_stats/duels/table.tsx b/src/app/(stats)/player/[ign]/_stats/duels/table.tsx
index d897442..7f917c2 100644
--- a/src/app/(stats)/player/[ign]/_stats/duels/table.tsx
+++ b/src/app/(stats)/player/[ign]/_stats/duels/table.tsx
@@ -4,7 +4,7 @@ import { getBestDuelsMode, getDevision, getDuelsModeStats, getMode } from "@/lib
 import { romanize } from "@/lib/hypixel/general"
 import { NonNullStats } from "@/lib/schema/player"
 
-export default function DuelsStatTable({ stats }: { stats: NonNullStats["Duels"] }) {
+export default function DuelsStatTable({ stats }: { stats: NonNullable<NonNullStats["Duels"]> }) {
     return (
         <Table>
             <DuelsTableHeader />
@@ -73,9 +73,7 @@ function DuelsTableHeader() {
     )
 }
 
-function DuelsStat({ modeId, stats }: { modeId: Parameters<typeof getMode>[0], stats: NonNullStats["Duels"] }) {
-    if (!stats) return null
-
+function DuelsStat({ modeId, stats }: { modeId: Parameters<typeof getMode>[0], stats: NonNullable<NonNullStats["Duels"]> }) {
     const modeStats = getDuelsModeStats(modeId, stats)
     const mode = getMode(modeId)
     const bestMode = getBestDuelsMode(stats) === modeId
diff --git a/src/app/(stats)/player/[ign]/_stats/murder-mystery/infection.tsx b/src/app/(stats)/player/[ign]/_stats/murder-mystery/infection.tsx
index 2e1e7f9..29111a2 100644
--- a/src/app/(stats)/player/[ign]/_stats/murder-mystery/infection.tsx
+++ b/src/app/(stats)/player/[ign]/_stats/murder-mystery/infection.tsx
@@ -3,9 +3,7 @@ import { devide } from "@/lib/hypixel/general"
 import { NonNullStats } from "@/lib/schema/player"
 import { BasicStat } from "../../_components/Stats"
 
-export default function InfectionStats({ stats }: { stats: NonNullStats["MurderMystery"] }) {
-    if (!stats) return null
-
+export default function InfectionStats({ stats }: { stats: NonNullable<NonNullStats["MurderMystery"]> }) {
     return (
         <div>
             <h2 className="text-xl font-bold">Infection</h2>
diff --git a/src/app/(stats)/player/[ign]/_stats/murder-mystery/murder-mystery.tsx b/src/app/(stats)/player/[ign]/_stats/murder-mystery/murder-mystery.tsx
index 22c5201..71ff3c4 100644
--- a/src/app/(stats)/player/[ign]/_stats/murder-mystery/murder-mystery.tsx
+++ b/src/app/(stats)/player/[ign]/_stats/murder-mystery/murder-mystery.tsx
@@ -34,7 +34,7 @@ export default function MurderMysteryStats({ stats }: { stats: NonNullStats["Mur
                     </AccordionTrigger>
                     <AccordionContent>
                         <Separator className="my-4" />
-                        <MurderMysteryGeneralStats statsChecked={stats} />
+                        <MurderMysteryGeneralStats stats={stats} />
                         <Separator className="my-4" />
                         <InfectionStats stats={stats} />
                         <Separator className="my-4" />
diff --git a/src/app/(stats)/player/[ign]/_stats/murder-mystery/stats.tsx b/src/app/(stats)/player/[ign]/_stats/murder-mystery/stats.tsx
index 185bd2e..256834b 100644
--- a/src/app/(stats)/player/[ign]/_stats/murder-mystery/stats.tsx
+++ b/src/app/(stats)/player/[ign]/_stats/murder-mystery/stats.tsx
@@ -4,9 +4,7 @@ import { getKnifeName } from "@/lib/hypixel/murder-mystery/general"
 import { NonNullStats } from "@/lib/schema/player"
 import { BasicStat } from "../../_components/Stats"
 
-export default function MurderMysteryGeneralStats({ statsChecked }: { statsChecked: NonNullStats["MurderMystery"] }) {
-    const stats = statsChecked!
-
+export default function MurderMysteryGeneralStats({ stats }: { stats: NonNullable<NonNullStats["MurderMystery"]> }) {
     const kd = formatNumber(devide(stats.kills, stats.deaths))
     const wl = formatNumber(devide(stats.wins, stats.losses))
     const weapon = getKnifeName(stats.active_knife_skin)
diff --git a/src/app/(stats)/player/[ign]/_stats/murder-mystery/table.tsx b/src/app/(stats)/player/[ign]/_stats/murder-mystery/table.tsx
index 2d71406..c246dc2 100644
--- a/src/app/(stats)/player/[ign]/_stats/murder-mystery/table.tsx
+++ b/src/app/(stats)/player/[ign]/_stats/murder-mystery/table.tsx
@@ -4,7 +4,7 @@ import { getBestMurderMysteryMode, getModeTitle, getMurderMysteryModeStats } fro
 import { NonNullStats } from "@/lib/schema/player"
 import { cn } from "@/lib/utils"
 
-export default function MurderMysteryStatTable({ stats }: { stats: NonNullStats["MurderMystery"] }) {
+export default function MurderMysteryStatTable({ stats }: { stats: NonNullable<NonNullStats["MurderMystery"]> }) {
     return (
         <Table>
             <MurderMysteryTableHeader />
@@ -44,9 +44,9 @@ function MurderMysteryTableHeader() {
     )
 }
 
-function MurderMysteryStat({ modeId, stats }: { modeId: Parameters<typeof getMurderMysteryModeStats>[0], stats: NonNullStats["MurderMystery"] }) {
-    if (!stats) return null
-
+function MurderMysteryStat(
+    { modeId, stats }: { modeId: Parameters<typeof getMurderMysteryModeStats>[0], stats: NonNullable<NonNullStats["MurderMystery"]> }
+) {
     const title = getModeTitle(modeId)
     const modeStats = getMurderMysteryModeStats(modeId, stats)
     const bestMode = getBestMurderMysteryMode(stats) === modeId