diff --git a/app/models/form.rb b/app/models/form.rb
index ee918aa89..691e062ef 100644
--- a/app/models/form.rb
+++ b/app/models/form.rb
@@ -35,15 +35,9 @@ class Form
   def next_page(page, case_log)
     page_ids = subsection_for_page(page).pages.map(&:id)
     page_index = page_ids.index(page.id)
-    nxt_page = if page.id.include?("value_check")
-                 if case_log[page.id] == 1
-                   get_page(page_ids[page_index - 1])
-                 else
-                   get_page(page_ids[page_index + 1])
-                 end
-               else
-                 get_page(page_ids[page_index + 1])
-               end
+    page_id = page.id.include?("value_check") && case_log[page.id] == 1 ? page_ids[page_index - 1] : page_ids[page_index + 1]
+    nxt_page = get_page(page_id)
+
     return :check_answers if nxt_page.nil?
     return nxt_page.id if nxt_page.routed_to?(case_log)