diff --git a/pedagogy/forms.py b/pedagogy/forms.py
index d0623731..4d03c83b 100644
--- a/pedagogy/forms.py
+++ b/pedagogy/forms.py
@@ -141,11 +141,8 @@ class UECommentForm(forms.ModelForm):
         if (
             all(
                 grade == -1
-                for grade in [
-                    self.cleaned_data[key]
-                    for key in self.cleaned_data
-                    if key.startswith("grade_")
-                ]
+                for key, grade in self.cleaned_data.items()
+                if key.startswith("grade_")
             )
             and not self.cleaned_data["comment"]
         ):
diff --git a/pedagogy/static/pedagogy/css/starlist.scss b/pedagogy/static/pedagogy/css/starlist.scss
index 43d1b05d..d2aa8f34 100644
--- a/pedagogy/static/pedagogy/css/starlist.scss
+++ b/pedagogy/static/pedagogy/css/starlist.scss
@@ -14,14 +14,10 @@ fieldset.star {
     color: gray;
   }
 
-  .hovered {
+  .unchecked.hovered {
     color: #FFD700;
   }
 
-  .checked.hovered {
-    color: orange;
-  }
-
   .removed {
     color: red;
   }
diff --git a/pedagogy/templates/pedagogy/starlist.jinja b/pedagogy/templates/pedagogy/starlist.jinja
index 275f012e..46c4a5ff 100644
--- a/pedagogy/templates/pedagogy/starlist.jinja
+++ b/pedagogy/templates/pedagogy/starlist.jinja
@@ -1,7 +1,7 @@
 <link-once rel="stylesheet" type="text/css" href="{{ statics.css }}" defer></link-once>
   <fieldset
     class="star"
-    x-data="{ 'value': {% if widget.value.0 %}{{ widget.value.0 }}{% else %}-1{% endif %}, 'hover': -1 }"
+    x-data="{ 'value': {{ widget.value.0 }}, 'hover': -1 }"
     @mouseover.outside="hover = -1"
     {% include "django/forms/widgets/attrs.html" %}
   >