diff --git a/app/views/locations/check_answers.html.erb b/app/views/locations/check_answers.html.erb
index 7fbcaad32..69a91ee55 100644
--- a/app/views/locations/check_answers.html.erb
+++ b/app/views/locations/check_answers.html.erb
@@ -18,14 +18,16 @@
                   <% next if %w[location_code status].include? attr[:attribute] %>
                   <%= summary_list.row do |row| %>
                   <% row.key { attr[:name] } %>
-                  <% row.value {
-                    if attr[:attribute].eql?("status")
-                      status_tag(attr[:value])
-                    elsif attr[:attribute].eql?("availability")
-                      details_html(name: "Availability", value: @location.startdate.present? ? @location.startdate.to_formatted_s(:govuk_date) : nil, attribute: "startdate")
-                    else
-                      details_html(attr)
-                    end } %>
+                  <%= row.value do %>
+                  <% case attr[:attribute]
+                     when "status"
+                       status_tag(attr[:value])
+                     when "availability"
+                       details_html(name: "Availability", value: @location.startdate.present? ? @location.startdate.to_formatted_s(:govuk_date) : nil, attribute: "startdate")
+                     else
+                       details_html(attr)
+                     end %>
+                  <% end %>
                   <% row.action(text: "Change", href: location_edit_path(@location, attr[:attribute])) unless attr[:name] == "Status" %>
                   <% end %>
               <% end %>
diff --git a/app/views/locations/index.html.erb b/app/views/locations/index.html.erb
index 466258616..34872141b 100644
--- a/app/views/locations/index.html.erb
+++ b/app/views/locations/index.html.erb
@@ -52,7 +52,7 @@
     <%= table.body do |body| %>
       <%= body.row do |row| %>
         <% row.cell(text: location.id) %>
-        <% row.cell(text: simple_format(location_cell_postcode(location, "/schemes/#{@scheme.id}/locations/#{location.id}#{"/check-answers" if location.incomplete?}"), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %>
+        <% row.cell(text: simple_format(location_cell_postcode(location, "/schemes/#{@scheme.id}/locations/#{location.id}#{'/check-answers' if location.incomplete?}"), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %>
         <% row.cell(text: location.units) %>
         <% row.cell(text: simple_format("<span>#{location.type_of_unit}</span>")) %>
         <% row.cell(text: location.mobility_type) %>