1 files changed, 5 insertions, 21 deletions
diff --git a/src/main/java/design/controller/userinput/menus/ManageCourses.java b/src/main/java/design/controller/userinput/menus/ManageCourses.java
index 5156a9b..dff48dc 100644
--- a/src/main/java/design/controller/userinput/menus/ManageCourses.java
+++ b/src/main/java/design/controller/userinput/menus/ManageCourses.java
@@ -6,11 +6,10 @@ import design.model.Course;
 import design.model.Golfer;
 import design.runtime.Session;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class ManageCourses extends Menu {
-    Golfer golfer = Session.getCurrentGolfer();
+    private final Golfer golfer = Session.getCurrentGolfer();
 
     @Override
     public String getTitle() {
@@ -30,25 +29,10 @@ public class ManageCourses extends Menu {
         }));
 
         opts.add(new MenuOption("remove course...", () -> {
-            new Menu() {
-                @Override
-                public String getTitle() {
-                    return "remove course";
-                }
-
-                @Override
-                public List<MenuOption> getMenuOptions() {
-                    List<MenuOption> list = new ArrayList<>();
-                    for (Course c : golfer.getCourses()) {
-                        MenuOption menuOption = new MenuOption(c.toString(), () -> {
-                            golfer.removeCourse(c);
-                            this.present();
-                        });
-                        list.add(menuOption);
-                    }
-                    return list;
-                }
-            }.present();
+            var selector = new SelectCourse(golfer);
+            selector.present();
+            golfer.removeCourse(selector.getResult());
+            this.present();
         }));
 
         opts.add(new MenuOption("add course...", () -> new SearchMenu().present()));