diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateEditPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateEditPage.java
index 7a5d2d27e7..fc207e173f 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateEditPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateEditPage.java
@@ -66,7 +66,7 @@ public class AdminGradingTemplateEditPage extends AbstractAdminProjectPage imple
         add(form);
     }
 
-    public static GradingReportTemplateUpdate toUpdate(EditingGradingTemplate editingGradingTemplate) {
+    static GradingReportTemplateUpdate toUpdate(EditingGradingTemplate editingGradingTemplate) {
         List<GradingReportTemplateUpdate.GradeLimit> gradeLimits = editingGradingTemplate
                 .getGradeLimits()
                 .getGradeLimits()
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatePage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatePage.java
index bed898f8f2..f445f860ee 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatePage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatePage.java
@@ -87,8 +87,7 @@ public class AdminGradingTemplatePage extends AbstractAdminProjectPage implement
         }
 
         private List<GradingCriterionTemplate> getCriteria(GradingReportTemplate gradingReportTemplate) {
-            ArrayList<GradingCriterionTemplate> criteria = new ArrayList<>();
-            gradingReportTemplate.getCriteria().forEach(criteria::add);
+            ArrayList<GradingCriterionTemplate> criteria = new ArrayList<>(gradingReportTemplate.getCriteria());
             criteria.sort(Comparator.comparing(GradingCriterionTemplate::getSortOrder));
             return Collections.unmodifiableList(criteria);
         }
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java
index 4c5e011efa..7d994d340f 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java
@@ -8,7 +8,6 @@ import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
 import se.su.dsv.scipro.admin.pages.AbstractAdminProjectPage;
 import se.su.dsv.scipro.components.NonEmptyLabel;
 import se.su.dsv.scipro.grading.GradingReportTemplateService;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java
index c6d490e392..7e4e935ad5 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java
@@ -86,7 +86,7 @@ class EditingGradingTemplate implements Serializable {
             this.titleEn = criteria.getTitleEn();
             this.pointsRequiredToPass = criteria.getPointsRequiredToPass();
             for (var point : criteria.getGradingCriterionPointTemplates()) {
-                if (point.getPoint() == 0) continue;;
+                if (point.getPoint() == 0) continue;
                 Point editingPoint = new Point(point);
                 this.points.add(editingPoint);
             }