diff --git a/app/models/form/lettings/questions/gender_same_as_sex.rb b/app/models/form/lettings/questions/gender_same_as_sex.rb
index 2e28d0fcd..a34296748 100644
--- a/app/models/form/lettings/questions/gender_same_as_sex.rb
+++ b/app/models/form/lettings/questions/gender_same_as_sex.rb
@@ -7,7 +7,7 @@ class Form::Lettings::Questions::GenderSameAsSex < ::Form::Question
     @conditional_for = { "gender_description#{person_index}" => [2] }
     @person_index = person_index
     @question_number = question_number
-    @inferred_check_answers_value = [{ "condition" => { "gender_same_as_sex#{person_index}" => 2 }, "value" => "No" }] #???
+    @inferred_check_answers_value = [{ "condition" => { "gender_same_as_sex#{person_index}" => 2 }, "value" => "No" }]
   end
 
   def answer_options
@@ -30,7 +30,7 @@ class Form::Lettings::Questions::GenderSameAsSex < ::Form::Question
   def label_from_value(value, _log = nil, _user = nil)
     return unless value
 
-    return "Prefers not to say" if value == 3
+    return "Prefers not to say" if value == "3"
 
     super
   end
diff --git a/app/models/form/lettings/questions/nationality.rb b/app/models/form/lettings/questions/nationality.rb
index 4aef6f7ee..514622c13 100644
--- a/app/models/form/lettings/questions/nationality.rb
+++ b/app/models/form/lettings/questions/nationality.rb
@@ -26,7 +26,7 @@ class Form::Lettings::Questions::Nationality < ::Form::Question
     return unless value
 
     return "Prefers not to say" if value == "13"
-    #do these combined qs work the same??
+
     super
   end
 end
diff --git a/app/models/form/lettings/questions/nationality_all.rb b/app/models/form/lettings/questions/nationality_all.rb
index 85a329700..786888f6b 100644
--- a/app/models/form/lettings/questions/nationality_all.rb
+++ b/app/models/form/lettings/questions/nationality_all.rb
@@ -21,8 +21,9 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question
 
   def label_from_value(value)
     return unless value
+
     return "Prefers not to say" if value.to_i.zero?
-    #??
+
     answer_options[value.to_s]["name"]
   end
 end
diff --git a/app/models/form/sales/questions/gender_same_as_sex.rb b/app/models/form/sales/questions/gender_same_as_sex.rb
index 27fd8034a..2619a0d2f 100644
--- a/app/models/form/sales/questions/gender_same_as_sex.rb
+++ b/app/models/form/sales/questions/gender_same_as_sex.rb
@@ -27,7 +27,7 @@ class Form::Sales::Questions::GenderSameAsSex < ::Form::Question
   def label_from_value(value, _log = nil, _user = nil)
     return unless value
 
-    return "Prefers not to say" if value == 3
+    return "Prefers not to say" if value == "3"
 
     super
   end
diff --git a/app/models/form/sales/questions/nationality_all.rb b/app/models/form/sales/questions/nationality_all.rb
index 25d36018b..b473ba558 100644
--- a/app/models/form/sales/questions/nationality_all.rb
+++ b/app/models/form/sales/questions/nationality_all.rb
@@ -25,8 +25,9 @@ class Form::Sales::Questions::NationalityAll < ::Form::Question
 
   def label_from_value(value)
     return unless value
+
     return "Prefers not to say" if value.to_i.zero?
-    #??
+
     answer_options[value.to_s]["name"]
   end
 end