diff --git a/rma_repair/data/repair_sequence.xml b/rma_repair/data/repair_sequence.xml
index 23f61a16..73ba79df 100644
--- a/rma_repair/data/repair_sequence.xml
+++ b/rma_repair/data/repair_sequence.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <record id="repair.seq_repair" model="ir.sequence">
diff --git a/rma_repair/views/repair_view.xml b/rma_repair/views/repair_view.xml
index 8a37e7e2..894f897f 100644
--- a/rma_repair/views/repair_view.xml
+++ b/rma_repair/views/repair_view.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="view_repair_order_form" model="ir.ui.view">
         <field name="name">repair.order.form rma_repair</field>
         <field name="model">repair.order</field>
-        <field name="inherit_id" ref="repair.view_repair_order_form"/>
+        <field name="inherit_id" ref="repair.view_repair_order_form" />
         <field name="arch" type="xml">
             <field name="guarantee_limit" position="after">
-                <field name="rma_line_id"/>
-                <field name="under_warranty"/>
+                <field name="rma_line_id" />
+                <field name="under_warranty" />
             </field>
         </field>
     </record>
diff --git a/rma_repair/views/rma_operation_view.xml b/rma_repair/views/rma_operation_view.xml
index 5d1f9060..22d7315f 100644
--- a/rma_repair/views/rma_operation_view.xml
+++ b/rma_repair/views/rma_operation_view.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="rma_operation_tree" model="ir.ui.view">
         <field name="name">rma.operation.tree - rma_repair</field>
         <field name="model">rma.operation</field>
-        <field name="inherit_id" ref="rma.rma_operation_tree"/>
+        <field name="inherit_id" ref="rma.rma_operation_tree" />
         <field name="arch" type="xml">
             <field name="delivery_policy" position="after">
-                <field name="repair_type"/>
+                <field name="repair_type" />
             </field>
         </field>
     </record>
@@ -15,10 +15,10 @@
     <record id="rma_operation_form" model="ir.ui.view">
         <field name="name">rma.operation.form - rma_repair</field>
         <field name="model">rma.operation</field>
-        <field name="inherit_id" ref="rma.rma_operation_form"/>
+        <field name="inherit_id" ref="rma.rma_operation_form" />
         <field name="arch" type="xml">
             <field name="delivery_policy" position="after">
-                <field name="repair_type"/>
+                <field name="repair_type" />
             </field>
         </field>
     </record>
diff --git a/rma_repair/views/rma_order_line_view.xml b/rma_repair/views/rma_order_line_view.xml
index d9a5f5a2..7928a39a 100644
--- a/rma_repair/views/rma_order_line_view.xml
+++ b/rma_repair/views/rma_order_line_view.xml
@@ -1,34 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="view_rma_line_form" model="ir.ui.view">
         <field name="name">rma.order.line.form - rma_repair</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_form"/>
+        <field name="inherit_id" ref="rma.view_rma_line_form" />
         <field name="arch" type="xml">
             <div name='button_box' position="inside">
-                <button type="object"  name="action_view_repair_order"
-                        class="oe_stat_button"
-                        icon="fa-wrench"
-                        groups="stock.group_stock_user">
-                        <field name="repair_count" widget="statinfo"
-                               string="Repair Orders"/>
+                <button
+                    type="object"
+                    name="action_view_repair_order"
+                    class="oe_stat_button"
+                    icon="fa-wrench"
+                    groups="stock.group_stock_user"
+                >
+                        <field
+                        name="repair_count"
+                        widget="statinfo"
+                        string="Repair Orders"
+                    />
                 </button>
             </div>
             <group name="quantities" position="inside">
                 <group>
-                    <field name="qty_to_repair"/>
-                    <field name="qty_under_repair"/>
-                    <field name="qty_to_pay"/>
-                    <field name="qty_repaired"/>
+                    <field name="qty_to_repair" />
+                    <field name="qty_under_repair" />
+                    <field name="qty_to_pay" />
+                    <field name="qty_repaired" />
                 </group>
             </group>
             <field name="delivery_policy" position="after">
-                <field name="repair_type"/>
+                <field name="repair_type" />
             </field>
             <notebook position="inside">
                 <page name="repair" string="Repair Orders">
-                    <field name="repair_ids" nolabel="1"/>
+                    <field name="repair_ids" nolabel="1" />
                 </page>
             </notebook>
         </field>
@@ -37,14 +43,16 @@
     <record id="view_rma_line_button_repair_form" model="ir.ui.view">
         <field name="name">rma.order.line.form - rma_repair</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_button_form"/>
+        <field name="inherit_id" ref="rma.view_rma_line_button_form" />
         <field name="arch" type="xml">
             <header position="inside">
-                <button name="%(action_rma_order_line_make_repair)d"
-                        states="approved"
-                        string="Create Repair Order"
-                        class="oe_highlight"
-                        type="action"/>
+                <button
+                    name="%(action_rma_order_line_make_repair)d"
+                    states="approved"
+                    string="Create Repair Order"
+                    class="oe_highlight"
+                    type="action"
+                />
             </header>
         </field>
     </record>
diff --git a/rma_repair/views/rma_order_view.xml b/rma_repair/views/rma_order_view.xml
index 73546bcc..c1e0faae 100644
--- a/rma_repair/views/rma_order_view.xml
+++ b/rma_repair/views/rma_order_view.xml
@@ -1,18 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="view_rma_form" model="ir.ui.view">
         <field name="name">rma.order.form - rma_repair</field>
         <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_form"/>
+        <field name="inherit_id" ref="rma.view_rma_form" />
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <button type="object" name="action_view_repair_order"
-                        class="oe_stat_button"
-                        icon="fa-wrench"
-                        groups="stock.group_stock_user">
-                    <field name="repair_count" widget="statinfo"
-                           string="Repair Orders"/>
+                <button
+                    type="object"
+                    name="action_view_repair_order"
+                    class="oe_stat_button"
+                    icon="fa-wrench"
+                    groups="stock.group_stock_user"
+                >
+                    <field
+                        name="repair_count"
+                        widget="statinfo"
+                        string="Repair Orders"
+                    />
                 </button>
             </div>
         </field>
diff --git a/rma_repair/wizards/rma_order_line_make_repair_view.xml b/rma_repair/wizards/rma_order_line_make_repair_view.xml
index 8d5cfb99..54ffaf6b 100644
--- a/rma_repair/wizards/rma_order_line_make_repair_view.xml
+++ b/rma_repair/wizards/rma_order_line_make_repair_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="view_rma_order_line_make_repair" model="ir.ui.view">
@@ -7,43 +7,54 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
              <form string="Create Repair">
-                 <separator string="New Repair Orders details:"/>
-                 <newline/>
+                 <separator string="New Repair Orders details:" />
+                 <newline />
                  <group>
                      <field name="item_ids" nolabel="1" colspan="2">
                           <tree string="Details" editable="bottom" create="false">
-                              <field name="line_id" options="{'no_open': true}"/>
-                              <field name="product_id"/>
-                              <field name="product_qty"/>
-                              <field name="product_uom_id" groups="uom.group_uom"/>
-                              <field name="partner_id"/>
-                              <field name="to_refurbish"/>
-                              <field name="refurbish_product_id" attrs="{'required': [('to_refurbish', '=', True)]}"/>
-                              <field name="location_id" groups="stock.group_stock_multi_locations"/>
-                              <field name="location_dest_id" groups="stock.group_stock_multi_locations"/>
-                              <field name="invoice_method"/>
+                              <field name="line_id" options="{'no_open': true}" />
+                              <field name="product_id" />
+                              <field name="product_qty" />
+                              <field name="product_uom_id" groups="uom.group_uom" />
+                              <field name="partner_id" />
+                              <field name="to_refurbish" />
+                              <field
+                                name="refurbish_product_id"
+                                attrs="{'required': [('to_refurbish', '=', True)]}"
+                            />
+                              <field
+                                name="location_id"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                              <field
+                                name="location_dest_id"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                              <field name="invoice_method" />
                           </tree>
                      </field>
                  </group>
-                 <newline/>
+                 <newline />
                  <footer>
-                     <button name="make_repair_order"
-                             string="Create Repair Orders" type="object"
-                             class="oe_highlight"/>
-                     <button special="cancel" string="Cancel" class="oe_link"/>
+                     <button
+                        name="make_repair_order"
+                        string="Create Repair Orders"
+                        type="object"
+                        class="oe_highlight"
+                    />
+                     <button special="cancel" string="Cancel" class="oe_link" />
                  </footer>
             </form>
         </field>
     </record>
 
-    <record id="action_rma_order_line_make_repair"
-            model="ir.actions.act_window">
+    <record id="action_rma_order_line_make_repair" model="ir.actions.act_window">
         <field name="name">Create Repair</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">rma.order.line.make.repair</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
-        <field name="binding_model_id" ref="rma_repair.model_rma_order_line"/>
+        <field name="binding_model_id" ref="rma_repair.model_rma_order_line" />
     </record>
 
 </odoo>