diff --git a/grade_team_contribution.py b/grade_team_contribution.py
index 1f7b5d97eafecfad13f4dc7e0fc09db8a6a74995..eb85d6f8f54e51955c99cb5c85db0275e11f0699 100644
--- a/grade_team_contribution.py
+++ b/grade_team_contribution.py
@@ -131,7 +131,7 @@ if __name__ == '__main__':
     print('First, select the "peer review" assignment to review and grade (select 0 if not grading peer reviews).\n')
     assignment_groups = course.get_assignment_groups()
     assignment_group = select_from_list(assignment_groups, 'assignment group', True)
-    grading_peer_reviews = assignment_group != 0
+    grading_peer_reviews = assignment_group is not None
     print()
     peer_review_assignment = None
     if grading_peer_reviews:
@@ -142,13 +142,13 @@ if __name__ == '__main__':
     print('Are you grading git histories?')
     options = ['Yes', 'No']
     option = select_from_list(options, 'option')
-    grading_git_histories = option == 1
+    grading_git_histories = option == options[0]
     print()
     print('Now select the student groupset with the teams.\n')
     student_groupsets = course.get_user_groupsets()
     student_groupset = select_from_list(student_groupsets, 'groupset')
     print(f'\nSelected {student_groupset}.\n')
-    student_groups = student_groupset.get_groups()
+    student_groups = student_groupset.get_groups()  # TODO: only need this if grading git histories
     project_prefix = get_project_prefix(student_groups)
     no_common_prefix: bool = True if project_prefix == '*' else False
     print('Are you grading all groups, or are you revisiting a specific group?')
@@ -158,7 +158,7 @@ if __name__ == '__main__':
         print('Which group?')
         student_groups = [select_from_list(student_groups, 'student group')]
     zero_padding: int = ceil(log10(len(projects)))
-    assignment_start_date = get_assignment_start()
+    assignment_start_date = get_assignment_start()  # TODO: only need this if grading git histories
     for student_group in student_groups:  # TODO: Skip past graded groups
         input(f'\n\nPress Enter to grade {student_group}')
         print()