diff --git a/app/models/form/lettings/questions/age.rb b/app/models/form/lettings/questions/age.rb
index 5b6567450..17652b3ef 100644
--- a/app/models/form/lettings/questions/age.rb
+++ b/app/models/form/lettings/questions/age.rb
@@ -16,10 +16,13 @@ class Form::Lettings::Questions::Age < ::Form::Question
   end
 
   def question_number
-    if form.start_date.year == 2023
-      31 + (4 * @person_index)
-    else
-      30 + (4 * @person_index)
-    end
+    base_question_number = case form.start_date.year
+                           when 2023
+                             31
+                           else
+                             30
+                           end
+
+    base_question_number + (4 * @person_index)
   end
 end
diff --git a/app/models/form/lettings/questions/age_known.rb b/app/models/form/lettings/questions/age_known.rb
index 8c7be6631..1ba815e7f 100644
--- a/app/models/form/lettings/questions/age_known.rb
+++ b/app/models/form/lettings/questions/age_known.rb
@@ -21,6 +21,13 @@ class Form::Lettings::Questions::AgeKnown < ::Form::Question
   ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
 
   def question_number
-    31 + (4 * @person_index)
+    base_question_number = case form.start_date.year
+                           when 2023
+                             31
+                           else
+                             30
+                           end
+
+    base_question_number + (4 * @person_index)
   end
 end
diff --git a/app/models/form/lettings/questions/person_gender_identity.rb b/app/models/form/lettings/questions/person_gender_identity.rb
index 87a76f0b1..ba12eab7c 100644
--- a/app/models/form/lettings/questions/person_gender_identity.rb
+++ b/app/models/form/lettings/questions/person_gender_identity.rb
@@ -27,10 +27,13 @@ class Form::Lettings::Questions::PersonGenderIdentity < ::Form::Question
   end
 
   def question_number
-    if form.start_date.year == 2023
-      32 + (4 * @person_index)
-    else
-      31 + (4 * @person_index)
-    end
+    base_question_number = case form.start_date.year
+                           when 2023
+                             32
+                           else
+                             31
+                           end
+
+    base_question_number + (4 * @person_index)
   end
 end
diff --git a/app/models/form/lettings/questions/person_relationship.rb b/app/models/form/lettings/questions/person_relationship.rb
index dcedd7125..11b5dad51 100644
--- a/app/models/form/lettings/questions/person_relationship.rb
+++ b/app/models/form/lettings/questions/person_relationship.rb
@@ -23,10 +23,13 @@ class Form::Lettings::Questions::PersonRelationship < ::Form::Question
   }.freeze
 
   def question_number
-    if form.start_date.year == 2023
-      30 + (4 * @person_index)
-    else
-      29 + (4 * @person_index)
-    end
+    base_question_number = case form.start_date.year
+                           when 2023
+                             30
+                           else
+                             29
+                           end
+
+    base_question_number + (4 * @person_index)
   end
 end
diff --git a/app/models/form/lettings/questions/person_working_situation.rb b/app/models/form/lettings/questions/person_working_situation.rb
index 61efb5f9f..c74411579 100644
--- a/app/models/form/lettings/questions/person_working_situation.rb
+++ b/app/models/form/lettings/questions/person_working_situation.rb
@@ -33,10 +33,13 @@ class Form::Lettings::Questions::PersonWorkingSituation < ::Form::Question
   }.freeze
 
   def question_number
-    if form.start_date.year == 2023
-      33 + (4 * @person_index)
-    else
-      32 + (4 * @person_index)
-    end
+    base_question_number = case form.start_date.year
+                           when 2023
+                             33
+                           else
+                             32
+                           end
+
+    base_question_number + (4 * @person_index)
   end
 end