diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index 9916d83..edfa2f5 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -70,7 +70,7 @@ public class Main {
         boolean success;
         switch (choice) {
             case 1:
-               //TODO
+                //TODO
                 break;
             case 2:
                 success = school.registerTeacher(username, password);
@@ -103,7 +103,7 @@ public class Main {
 
         switch (choice) {
             case 1:
-               //TODO
+                //TODO
                 break;
             case 2:
                 Teacher teacher = school.loginTeacher(username, password);
@@ -135,13 +135,13 @@ public class Main {
 
             switch (choice) {
                 case 1:
-                    school.showAllCourses();
+                    System.out.print(school.getAllCoursesDisplay());
                     break;
                 case 2:
                     enrollInCourse(student);
                     break;
                 case 3:
-                    //student.showMyCourses();
+                    //System.out.print(student.getMyCoursesDisplay());
                     break;
                 case 4:
                     System.out.println(" Goodbye, " + student.getUsername() + "!");
@@ -174,13 +174,13 @@ public class Main {
 
             switch (choice) {
                 case 1:
-                    school.showAllCourses();
+                    System.out.print(school.getAllCoursesDisplay());
                     break;
                 case 2:
                     addNewCourseToSystem(teacher);
                     break;
                 case 3:
-                    teacher.showMyCourses();
+                    System.out.print(teacher.getMyCoursesDisplay());
                     break;
                 case 4:
                     addCourseToTeacher(teacher);
@@ -216,7 +216,7 @@ public class Main {
     }
 
     private static void addCourseToTeacher(Teacher teacher) {
-        school.showAllCourses();
+        System.out.print(school.getAllCoursesDisplay());
         System.out.print("\nEnter Course ID to add to your list: ");
         int courseId = getIntInput();
 
@@ -234,7 +234,7 @@ public class Main {
     }
 
     private static void removeCourseFromTeacher(Teacher teacher) {
-        teacher.showMyCourses();
+        System.out.print(teacher.getMyCoursesDisplay());
         if (teacher.getMyCourses().isEmpty()) return;
 
         System.out.print("\nEnter Course ID to remove from your list: ");
@@ -254,7 +254,7 @@ public class Main {
     }
 
     private static void showStudentsInTeacherCourse(Teacher teacher) {
-        teacher.showMyCourses();
+        System.out.print(teacher.getMyCoursesDisplay());
         if (teacher.getMyCourses().isEmpty()) return;
 
         System.out.print("\nEnter Course ID to see students: ");
@@ -266,7 +266,8 @@ public class Main {
             return;
         }
 
-        teacher.showStudentsInCourse(course);
+        String result = teacher.getStudentsDisplayForCourse(course);
+        System.out.println(result);
     }
 
     private static int getIntInput() {