diff --git a/components/PointsList.js b/components/PointsList.js
index 549443b..f056f6b 100644
--- a/components/PointsList.js
+++ b/components/PointsList.js
@@ -4,15 +4,17 @@ import React from 'react';
 import styles from '../styles/PointsList.module.css';
 
 const PointsList = ({ pointsData, onPointSelect }) => {
-    const calculateTotalSets = (setScore) => {
-        const scores = setScore.split('-').map(Number);
-        return scores.reduce((a, b) => a + b, 0) + 1;
-    }
+    // Switched for Point Title Calculated in Notebook
+    // const calculateTotalSets = (setScore) => {
+    //     const scores = setScore.split('-').map(Number);
+    //     return scores.reduce((a, b) => a + b, 0) + 1;
+    // }
+
     return (
         <ul className={styles.pointsList}>
             {pointsData.map((point, index) => (
                 <li className={styles.pointsListItem} key={index} onClick={() => onPointSelect(point.Position)}>
-                    {"Score: " + point.Name + " Games: " + point.gameScore + " Set: " + calculateTotalSets(point.setScore)}
+                    {point.Name}
                 </li>
             ))}
         </ul>
diff --git a/services/nameMap.js b/services/nameMap.js
index ba1f110..a53483e 100644
--- a/services/nameMap.js
+++ b/services/nameMap.js
@@ -4,7 +4,6 @@
    
 const nameMap = {
    // New Player1 Focused Map
-   //Group 1: Serve
     "player1ServePlacement"  : 'Serve Placement',
     "player1ServeResult"     : 'Serve Result',