diff --git a/l10n_us_ar_hr_payroll/data/base.xml b/l10n_us_ar_hr_payroll/data/base.xml
index 38534fdd..2e004924 100755
--- a/l10n_us_ar_hr_payroll/data/base.xml
+++ b/l10n_us_ar_hr_payroll/data/base.xml
@@ -2,27 +2,27 @@
 <odoo>
 
     <!-- PARTNERS -->
-    <record id="res_partner_adws_unemp" model="res.partner">
+    <record id="res_partner_ar_dws_unemp" model="res.partner">
         <field name="name"> Arkansas Department of Workforce Solutions - Unemployment Tax</field>
         <field name="supplier">1</field>
         <field eval="0" name="customer"/>
     </record>
-    <record id="res_partner_adfa_withhold" model="res.partner">
+    <record id="res_partner_ar_dfa_withhold" model="res.partner">
         <field name="name">Arkansas Department of Financial Administration- Income Tax Withholding</field>
         <field name="supplier">1</field>
         <field eval="0" name="customer"/>
     </record>
 
     <!-- CONTRIBUTION REGISTERS -->
-    <record id="contrib_register_adws_unemp" model="hr.contribution.register">
+    <record id="contrib_register_ar_dws_unemp" model="hr.contribution.register">
         <field name="name">Arkansas Unemployment</field>
         <field name="note"> Arkansas Department of Workforce Solutions - Unemployment</field>
-        <field name="partner_id" ref="res_partner_adws_unemp"/>
+        <field name="partner_id" ref="res_partner_ar_dws_unemp"/>
     </record>
-    <record id="contrib_register_adfa_withhold" model="hr.contribution.register">
+    <record id="contrib_register_ar_dfa_withhold" model="hr.contribution.register">
         <field name="name">Arkansas Income Tax Withholding</field>
         <field name="note">Arkansas Department of Financial Administration - Income Tax Withholding</field>
-        <field name="partner_id" ref="res_partner_adfa_withhold"/>
+        <field name="partner_id" ref="res_partner_ar_dfa_withhold"/>
     </record>
 
 
diff --git a/l10n_us_ar_hr_payroll/data/rules.xml b/l10n_us_ar_hr_payroll/data/rules.xml
index 7082c131..b9b73e35 100755
--- a/l10n_us_ar_hr_payroll/data/rules.xml
+++ b/l10n_us_ar_hr_payroll/data/rules.xml
@@ -42,7 +42,7 @@ result = categories.WAGE_US_AR_UNEMP
 if result_rate == 0.0:
     result = 0.0
         </field>
-        <field name="register_id" ref="contrib_register_adws_unemp"/>
+        <field name="register_id" ref="contrib_register_ar_dws_unemp"/>
         <field name="appears_on_payslip" eval="False"/>
     </record>
 
@@ -60,22 +60,20 @@ annual_gross_pay = 0.00
 allowance_amt = contract.ar_w4_allowances * 26.00
 schedule_pay = contract.schedule_pay
 standard_deduction = 2200
-pay_period = 0.0
 additional_withholding = contract.ar_w4_additional_wh
 
 if contract.w4_filing_status == 'married':
             standard_deduction = standard_deduction * 2
 
-if schedule_pay == 'daily':
-    pay_period = 260.0
-elif schedule_pay == 'weekly':
-    pay_period = 52.0
-elif schedule_pay == 'bi-weekly':
-    pay_period = 26.0
-elif schedule_pay == 'semi-monthly':
-    pay_period = 24.0
-elif schedule_pay == 'monthly':
-    pay_period = 12.0
+pay_period = 0.0
+pay_periods = {
+            'weekly': 52.0,
+            'bi-weekly': 26.0,
+            'semi-monthly': 24.0,
+            'monthly': 12.0
+            }
+if schedule_pay in pay_periods:
+    pay_period = pay_periods[schedule_pay]
 else:
     raise Exception('Invalid schedule_pay="' + schedule_pay + '" for AR Income Withholding calculation')
 
@@ -109,7 +107,7 @@ for row in tax_rate_table:
 result = (result / pay_period) + additional_withholding
 result = -result
         </field>
-        <field name="register_id" ref="contrib_register_adfa_withhold"/>
+        <field name="register_id" ref="contrib_register_ar_dfa_withhold"/>
     </record>
 
 </odoo>