diff --git a/src/ObjLoading/Game/T6/Leaderboard/JsonLeaderboardDefLoader.cpp b/src/ObjLoading/Game/T6/Leaderboard/JsonLeaderboardDefLoader.cpp
index 729aac64..84cbadfd 100644
--- a/src/ObjLoading/Game/T6/Leaderboard/JsonLeaderboardDefLoader.cpp
+++ b/src/ObjLoading/Game/T6/Leaderboard/JsonLeaderboardDefLoader.cpp
@@ -55,15 +55,8 @@ namespace
             lbColumnDef.name = m_memory.Dup(jColumn.name.c_str());
             lbColumnDef.colId = jColumn.colId;
 
-            if (jColumn.dwColIndex)
-                lbColumnDef.dwColIndex = jColumn.dwColIndex.value();
-            else
-                lbColumnDef.dwColIndex = -1;
-
-            if (jColumn.hidden)
-                lbColumnDef.hidden = jColumn.hidden.value();
-            else
-                lbColumnDef.hidden = false;
+            lbColumnDef.dwColIndex = jColumn.dwColIndex.value_or(-1);
+            lbColumnDef.hidden = jColumn.hidden.value_or(false);
 
             if (jColumn.statName)
                 lbColumnDef.statName = m_memory.Dup(jColumn.statName->c_str());
@@ -72,10 +65,7 @@ namespace
 
             lbColumnDef.type = jColumn.type;
 
-            if (jColumn.precision)
-                lbColumnDef.precision = jColumn.precision.value();
-            else
-                lbColumnDef.precision = 0;
+            lbColumnDef.precision = jColumn.precision.value_or(0);
 
             lbColumnDef.agg = jColumn.aggregationFunction;
 
@@ -84,15 +74,8 @@ namespace
             else
                 lbColumnDef.localization = nullptr;
 
-            if (jColumn.uiCalColX)
-                lbColumnDef.uiCalColX = jColumn.uiCalColX.value();
-            else
-                lbColumnDef.uiCalColX = 0;
-
-            if (jColumn.uiCalColY)
-                lbColumnDef.uiCalColY = jColumn.uiCalColY.value();
-            else
-                lbColumnDef.uiCalColY = 0;
+            lbColumnDef.uiCalColX = jColumn.uiCalColX.value_or(0);
+            lbColumnDef.uiCalColY = jColumn.uiCalColY.value_or(0);
 
             return true;
         }
@@ -102,15 +85,8 @@ namespace
             leaderboardDef.id = jLeaderboardDef.id;
             leaderboardDef.dwColumnCount = jLeaderboardDef.dwColumnCount;
 
-            if (jLeaderboardDef.xpColId)
-                leaderboardDef.xpColId = jLeaderboardDef.xpColId.value();
-            else
-                leaderboardDef.xpColId = -1;
-
-            if (jLeaderboardDef.prestigeColId)
-                leaderboardDef.prestigeColId = jLeaderboardDef.prestigeColId.value();
-            else
-                leaderboardDef.prestigeColId = -1;
+            leaderboardDef.xpColId = jLeaderboardDef.xpColId.value_or(-1);
+            leaderboardDef.prestigeColId = jLeaderboardDef.prestigeColId.value_or(-1);
 
             if (!jLeaderboardDef.columns.empty())
             {