diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index 4f58431..1d16fce 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -62,23 +62,7 @@ export class GPAUtils
         let totalGPA = 0;
         courses.forEach(course =>
         {
-            // Find the GPA for this course.
-            this.SCALE.forEach(scale =>
-            {
-                // Letter grades are the same
-                if (scale[this.LETTER] == course.letterGrade)
-                {
-                    // Get grade and add it
-                    let grade = <number> scale[this.GPA];
-                    totalGPA += grade;
-
-                    // Add scaleUp if not failed.
-                    if (grade != 0) totalGPA += course.scaleUp;
-
-                    // That's it
-                    return;
-                }
-            })
+            totalGPA += this.getGP(course);
         });
 
         // Get average GPA