diff --git a/frontend/react-app/src/pages/MyTasks.jsx b/frontend/react-app/src/pages/MyTasks.jsx
index 68d42b7..b928d72 100644
--- a/frontend/react-app/src/pages/MyTasks.jsx
+++ b/frontend/react-app/src/pages/MyTasks.jsx
@@ -12,35 +12,40 @@ import { useState, useEffect } from 'react';
 function getAssigneesNames(taskItem) {
     return taskItem.assignedMembers.map((member) => member.userName).join(", ");
 }
+function mapTaskItem(taskItem) {
+    return {
+      name: taskItem,
+      id: taskItem.taskId,
+      team: taskItem.teamId,
+      assignees: getAssigneesNames(taskItem),
+      dueDate: taskItem.dueDate || "No Due Date",
+    };
+  }
 
-function setUpData(results) {
+  function setUpData(results) {
     return results
     .filter((taskItem) => taskItem.status !== "Done")
-      .map((taskItem) => ({
-        id: taskItem.taskId,
-        name: taskItem,
-        team: taskItem.teamId,
-        assignees: getAssigneesNames(taskItem),
-        status: taskItem.status,
-        priority: taskItem.priority,
-        dueDate: taskItem.dueDate || "No Due Date",
-        isLocked: taskItem.isLocked.toString()
-      }));
-}
-
-function setUpDataCompleted(results) {
+      .map((taskItem) => {
+        const baseItem = mapTaskItem(taskItem);
+        return{
+          ...baseItem,
+          status: taskItem.status,
+          priority: taskItem.priority,
+          isLocked: taskItem.isLocked.toString()
+        };
+        
+      });
+  }
+  function setUpDataCompleted(results) {
     return results
       .filter((taskItem) => taskItem.status === "Done")
-      .map((taskItem) => ({
-        id: taskItem.taskId,
-        name: taskItem,
-        assignees: getAssigneesNames(taskItem),
-        priority: taskItem.priority,
-        status: taskItem.status,
-        dueDate: taskItem.dueDate || "No Due Date",
-        dateCompleted: taskItem.dateCompleted,
-        isLocked: taskItem.isLocked.toString()
-      }));
+      .map((taskItem) => {
+        const baseItem = mapTaskItem(taskItem);
+        return{
+          ...baseItem,
+          dateCompleted: taskItem.dateCompleted,
+        };
+      });
   }
 
 function MyTasks(){
@@ -127,6 +132,8 @@ const headerAndAccessorsComplete = [
 if(loading){
     return (<div>Loading...</div>)
 }
+const tasksToDoData = setUpData(tasksToDo);
+const tasksCompletedData = setUpDataCompleted(tasksToDo);
 return (
 
     <div className='pageContainer'>
@@ -136,9 +143,9 @@ return (
                 
                 <h1>My Tasks</h1>
                 <span class ="taskBox">
-                {setUpData(tasksToDo).length > 0 ? (
+                {tasksToDoData.length > 0 ? (
                     <TaskList
-                    dataToUse={setUpData(tasksToDo)}
+                    dataToUse={tasksToDoData}
                     headersAndAccessors={headerAndAccessors}
                     />
                 ) : (
@@ -150,9 +157,9 @@ return (
                 <a href="/create-task"><button className="create-task-btn">Create Task</button></a>
                 
                 <h2>My Completed Tasks</h2>
-                {setUpDataCompleted(tasksToDo).length > 0 ? (
+                {tasksCompletedData.length > 0 ? (
                     <TaskList
-                    dataToUse={setUpDataCompleted(tasksToDo)}
+                    dataToUse={tasksCompletedData}
                     headersAndAccessors={headerAndAccessorsComplete}
                     />
                 ) : (
diff --git a/frontend/react-app/src/pages/TeamTasks.jsx b/frontend/react-app/src/pages/TeamTasks.jsx
index baa53df..736163f 100644
--- a/frontend/react-app/src/pages/TeamTasks.jsx
+++ b/frontend/react-app/src/pages/TeamTasks.jsx
@@ -14,30 +14,39 @@ import { getTeamTasks } from "../api/teamApi";
 function getAssigneesNames(taskItem) {
   return taskItem.assignedMembers.map((member) => member.userName).join(", ");
 }
+
+function mapTaskItem(taskItem) {
+  return {
+    name: taskItem,
+    id: taskItem.taskId,
+    assignees: getAssigneesNames(taskItem),
+    dueDate: taskItem.dueDate || "No Due Date",
+  };
+}
 function setUpData(results) {
   return results
   .filter((taskItem) => taskItem.status !== "Done")
-    .map((taskItem) => ({
-      id: taskItem.taskId,
-      name: taskItem,
-      assignees: getAssigneesNames(taskItem),
-      status: taskItem.status,
-      priority: taskItem.priority,
-      dueDate: taskItem.dueDate || "No Due Date",
-      isLocked: taskItem.isLocked.toString()
-    }));
+    .map((taskItem) => {
+      const baseItem = mapTaskItem(taskItem);
+      return{
+        ...baseItem,
+        status: taskItem.status,
+        priority: taskItem.priority,
+        isLocked: taskItem.isLocked.toString()
+      };
+      
+    });
 }
 function setUpDataCompleted(results) {
   return results
     .filter((taskItem) => taskItem.status === "Done")
-    .map((taskItem) => ({
-      id: taskItem.taskId,
-      name: taskItem,
-      assignees: getAssigneesNames(taskItem),
-      dueDate: taskItem.dueDate || "No Due Date",
-      dateCompleted: taskItem.dateCompleted,
-      isLocked: taskItem.isLocked.toString()
-    }));
+    .map((taskItem) => {
+      const baseItem = mapTaskItem(taskItem);
+      return{
+        ...baseItem,
+        dateCompleted: taskItem.dateCompleted,
+      };
+    });
 }
 
 const commonColumns= [
@@ -153,16 +162,19 @@ if(loadingNames || loadingTasks){
     { id: 5, name: "Joe Smith" },
   ];
   
-
+  const tasksToDoData = setUpData(tasksToDo);
+  const tasksCompletedData = setUpDataCompleted(tasksToDo);
 
     return (
+
+
       <div className='pageContainer'>
         <Header/>
         <div className='pageBody'>
         <h2>Team 1 Tasks</h2>
-          {setUpData(tasksToDo).length > 0 ? (
+          {tasksToDoData.length > 0 ? (
             <TaskList
-              dataToUse={setUpData(tasksToDo)}
+              dataToUse={tasksToDoData}
               headersAndAccessors={headerAndAccessors}
             />
           ) : (
@@ -172,9 +184,9 @@ if(loadingNames || loadingTasks){
 
             <a href="/create-task"><button className="create-task-btn">Create Task</button></a>
             <h2>Completed Tasks</h2>
-            {setUpDataCompleted(tasksToDo).length > 0 ? (
+            {tasksCompletedData.length > 0 ? (
             <TaskList
-              dataToUse={setUpDataCompleted(tasksToDo)}
+              dataToUse={tasksCompletedData}
               headersAndAccessors={headerAndAccessorsComplete}
             />
           ) : (