diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index 6fd839e4e..4a045b27e 100644
--- a/app/models/form/question.rb
+++ b/app/models/form/question.rb
@@ -121,7 +121,7 @@ class Form::Question
     when "radio"
       RADIO_YES_VALUE[id.to_sym]&.include?(value)
     else
-      value.downcase == "yes"
+      %w[yes].include?(value.downcase)
     end
   end
 
@@ -132,7 +132,7 @@ class Form::Question
     when "radio"
       RADIO_NO_VALUE[id.to_sym]&.include?(value)
     else
-      value.downcase == "no"
+      %w[no].include?(value.downcase)
     end
   end
 
diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb
index 7b0595ac2..f38a7a8ee 100644
--- a/app/models/validations/household_validations.rb
+++ b/app/models/validations/household_validations.rb
@@ -7,7 +7,7 @@ module Validations::HouseholdValidations
     if record.is_not_homeless? && record.given_reasonable_preference?
       record.errors.add :reasonpref, I18n.t("validations.household.reasonpref.not_homeless")
       record.errors.add :homeless, I18n.t("validations.household.homeless.reasonpref.not_homeless")
-    elsif record.reasonpref == 1
+    elsif !record.given_reasonable_preference?
       if [record.rp_homeless, record.rp_insan_unsat, record.rp_medwel, record.rp_hardship, record.rp_dontknow].any? { |a| a == 1 }
         record.errors.add :reasonable_preference_reason, I18n.t("validations.household.reasonable_preference_reason.reason_not_required")
       end
diff --git a/app/models/validations/property_validations.rb b/app/models/validations/property_validations.rb
index af551a849..cd11a5162 100644
--- a/app/models/validations/property_validations.rb
+++ b/app/models/validations/property_validations.rb
@@ -55,7 +55,7 @@ module Validations::PropertyValidations
                        E09000032
                        E09000033].freeze
   def validate_la(record)
-    if record.la.present? && !LONDON_BOROUGHS.include?(record.la) && (record.is_london_rent?)
+    if record.la.present? && !LONDON_BOROUGHS.include?(record.la) && record.is_london_rent?
       record.errors.add :la, I18n.t("validations.property.la.london_rent")
     end
 
diff --git a/spec/models/form/question_spec.rb b/spec/models/form/question_spec.rb
index 9ffac8883..d82293907 100644
--- a/spec/models/form/question_spec.rb
+++ b/spec/models/form/question_spec.rb
@@ -46,15 +46,15 @@ RSpec.describe Form::Question, type: :model do
   end
 
   it "has a yes value helper" do
-    expect(question.value_is_yes?("Yes")).to be_truthy
-    expect(question.value_is_yes?("YES")).to be_truthy
-    expect(question.value_is_yes?("random")).to be_falsey
+    expect(question).to be_value_is_yes("Yes")
+    expect(question).to be_value_is_yes("YES")
+    expect(question).not_to be_value_is_yes("random")
   end
 
   it "has a no value helper" do
-    expect(question.value_is_no?("No")).to be_truthy
-    expect(question.value_is_no?("NO")).to be_truthy
-    expect(question.value_is_no?("random")).to be_falsey
+    expect(question).to be_value_is_no("No")
+    expect(question).to be_value_is_no("NO")
+    expect(question).not_to be_value_is_no("random")
   end
 
   context "when type is numeric" do