diff --git a/app/components/admin/legislation/draft_versions/form_component.html.erb b/app/components/admin/legislation/draft_versions/form_component.html.erb
index f2d187110..79cc3a4cd 100644
--- a/app/components/admin/legislation/draft_versions/form_component.html.erb
+++ b/app/components/admin/legislation/draft_versions/form_component.html.erb
@@ -1,12 +1,6 @@
 <%= render "shared/globalize_locales", resource: draft_version %>
 
-<%= translatable_form_for [:admin, process, draft_version], url: url,
-                                                            html: {
-                                                              data: {
-                                                                markdown_changes_message: I18n.t("admin.legislation.draft_versions.edit.markdown_changes_message")
-                                                              },
-                                                              class: "legislation-draft-versions-form"
-                                                            } do |f| %>
+<%= translatable_form_for [:admin, process, draft_version], form_attributes do |f| %>
   <%= render "shared/errors", resource: draft_version %>
 
   <div class="row">
@@ -81,7 +75,7 @@
     </div>
 
     <div class="small-12 medium-3 column clear end margin-top">
-      <%= f.submit(class: "button success expanded", value: t("admin.legislation.draft_versions.#{admin_submit_action(draft_version)}.submit_button")) %>
+      <%= f.submit(class: "button success expanded", value: submit_button_text) %>
     </div>
   </div>
 <% end %>
diff --git a/app/components/admin/legislation/draft_versions/form_component.rb b/app/components/admin/legislation/draft_versions/form_component.rb
index 8ecbf7311..ef90c4ebc 100644
--- a/app/components/admin/legislation/draft_versions/form_component.rb
+++ b/app/components/admin/legislation/draft_versions/form_component.rb
@@ -14,4 +14,22 @@ class Admin::Legislation::DraftVersions::FormComponent < ApplicationComponent
     def process
       draft_version.process
     end
+
+    def form_attributes
+      {
+        url: url,
+        html: {
+          data: { markdown_changes_message: markdown_changes_message },
+          class: "legislation-draft-versions-form"
+        }
+      }
+    end
+
+    def markdown_changes_message
+      I18n.t("admin.legislation.draft_versions.edit.markdown_changes_message")
+    end
+
+    def submit_button_text
+      t("admin.legislation.draft_versions.#{admin_submit_action(draft_version)}.submit_button")
+    end
 end