1 files changed, 23 insertions, 26 deletions

diff --git a/src/main/java/design/controller/userinput/menus/SearchMenu.java b/src/main/java/design/controller/userinput/menus/SearchMenu.java
index 6d9fe26..48aebb0 100644
--- a/src/main/java/design/controller/userinput/menus/SearchMenu.java
+++ b/src/main/java/design/controller/userinput/menus/SearchMenu.java
@@ -19,21 +19,27 @@ public class SearchMenu extends Menu {
 
     @Override
     public List<MenuOption> getMenuOptions() {
-        return List.of(
-                new MenuOption("return to main menu", () -> new MainMenu().present()),
-                new MenuOption("search...", () -> new CourseSearch().present()),
-                new MenuOption("add difficulty filter...", () -> addFilter(new SortByDifficulty())),
-                new MenuOption("add hole count filter...", () -> addFilter(new SortByHoles())),
-                new MenuOption("add location filter...", () -> addFilter(new SortByLocation())),
-                new MenuOption("add par filter...", () -> addFilter(new SortByPar())),
-                new MenuOption("list filters", this::printFilters),
-                new MenuOption("clear all filters", this::clearFilters)
-        );
-    }
-
-    private void printFilters() {
-        System.out.println("\nYou are filtering by ");
-        System.out.println(query.printFilters());
+        List<MenuOption> menuOptions = new java.util.ArrayList<>();
+
+        menuOptions.add(new MenuOption("return to main menu", () -> new MainMenu().present()));
+        menuOptions.add(new MenuOption("search...", () -> new CourseSearch().present()));
+
+        menuOptions.add(new MenuOption("sort by difficulty", () -> addFilter(new SortByDifficulty())));
+        menuOptions.add(new MenuOption("sort by hole count", () -> addFilter(new SortByHoles())));
+        menuOptions.add(new MenuOption("sort by location", () -> addFilter(new SortByLocation())));
+        menuOptions.add(new MenuOption("sort by par", () -> addFilter(new SortByPar())));
+
+        menuOptions.add(new MenuOption("list filters", () -> {
+            System.out.println("\nYou are filtering by ");
+            System.out.println(query.printFilters());
+        }));
+
+        menuOptions.add(new MenuOption("clear sorting filters", () -> {
+            query.clearFilters();
+            System.out.println("\nCleared all filters.\n");
+            this.present();
+        }));
+        return menuOptions;
     }
 
     /*
@@ -41,16 +47,7 @@ public class SearchMenu extends Menu {
      */
     public void addFilter(CourseSorter filter) {
         query.addFilter(filter);
-        System.out.println("\nAdded filter.\n");
-        new SearchMenu().present();
-    }
-
-    /*
-     * clear all of our filters.
-     */
-    public void clearFilters() {
-        query.clearFilters();
-        System.out.println("\nCleared all filters.\n");
-        new SearchMenu().present();
+        System.out.println("\nAdded sorting filter.\n");
+        this.present();
     }
 }