Menu cleanup - pass 1

2 files changed, 13 insertions, 4 deletions

diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java
index c199563..ce7c0e3 100644
--- a/src/main/java/design/model/Course.java
+++ b/src/main/java/design/model/Course.java
@@ -1,6 +1,5 @@
 package design.model;
 
-import design.model.course_search.CourseList;
 import design.model.course_search.ICourse;
 
 import java.util.List;
@@ -9,7 +8,7 @@ public class Course implements ICourse {
 
     private final int id;
     private final String name;
-    private final int difficultyRating;
+    private final float difficultyRating;
     private final String location;
     private final int holeCount;
     private final int totalPar;
@@ -61,6 +60,7 @@ public class Course implements ICourse {
     
     @Override
     public String toString() {
-        return name + ", " + location + ", " + difficultyRating + ", " + holeCount + ", " + totalPar;
+        return String.format("%s (%s) | Holes: %d | Total Par: %d | Difficulty: %.1f",
+                name, location, holeCount, totalPar, difficultyRating);
     }
 }
diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java
index d34073f..07c2368 100644
--- a/src/main/java/design/model/Golfer.java
+++ b/src/main/java/design/model/Golfer.java
@@ -12,7 +12,7 @@ public class Golfer {
     private final List<Course> courses;
     private final List<Round> rounds;
     private final List<Club> clubs; // Keep track of golfer's clubs
-    private int nextClubId = 1;
+    private int nextClubId;
 
     @JsonCreator
     private Golfer(String username, int passwordHash, String fullName, List<Course> courses, List<Round> rounds,
@@ -93,4 +93,13 @@ public class Golfer {
     public Club[] getClubs() {
         return clubs.toArray(Club[]::new);
     }
+
+    @Override
+    public String toString() {
+        return String.format("%s (@%s)", fullName, username);
+    }
+
+    public void removeClub(Club c) {
+        clubs.remove(c);
+    }
 }