diff --git a/config/resq.services.yaml b/config/resq.services.yaml
index d71a8df8..1756cf98 100644
--- a/config/resq.services.yaml
+++ b/config/resq.services.yaml
@@ -188,11 +188,10 @@ services:
     # rider API service
     App\Service\RiderAPIHandler\ResqRiderAPIHandler: 
         arguments:
-            $country_code: "%env(COUNTRY_CODE)%"
+            $country_code: "%env(COUNTRY_CODE)%" 
 
-    # rider API interface
     App\Service\RiderAPIHandlerInterface: "@App\\Service\\RiderAPIHandler\\ResqRiderAPIHandler"
-
+    
     # map manager
     #App\Service\GISManager\Bing: ~
     App\Service\GISManager\OpenStreet: ~
diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index ee23e2ff..40f428ee 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -916,7 +916,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             $this->rah->fulfillJobOrder($obj, $image_url, $rider); 
 
             // create the warranty if new battery only
-            if ($obj->getServiceType () == CMBServiceType::BATTERY_REPLACEMENT_NEW) 
+            if ($this->checkIfNewBattery($obj))
             {
                 $serial = $req->request->get('warranty_code') ;
                 $warranty_class = $obj->getWarrantyClass();
@@ -2280,7 +2280,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
     public function updateVehicleBattery(JobOrder $jo)
     {
         // check if new battery
-        if ($jo->getServiceType() != CMBServiceType::BATTERY_REPLACEMENT_NEW)
+        if (!($this->checkIfNewBattery($jo)))
             return;
 
         // customer vehicle
@@ -2337,6 +2337,14 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         return $params;
     }
 
+    public function checkIfNewBattery(JobOrder $jo)
+    {
+        if ($jo->getServiceType() == CMBServiceType::BATTERY_REPLACEMENT_NEW)
+            return true;
+
+        return false;
+    }
+
     protected function fillDropdownParameters(&$params)
     {
         $em = $this->em;
diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 2badddaa..c6a6fa01 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -716,7 +716,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             $this->rah->fulfillJobOrder($obj, $image_url, $rider);
 
             // create the warranty if new battery only
-            if ($obj->getServiceType () == ServiceType::BATTERY_REPLACEMENT_NEW)
+            if ($this->checkIfNewBattery($obj))
             {
                 $serial = null;
                 $warranty_class = $obj->getWarrantyClass();
@@ -2233,7 +2233,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
     public function updateVehicleBattery(JobOrder $jo)
     {
         // check if new battery
-        if ($jo->getServiceType() != ServiceType::BATTERY_REPLACEMENT_NEW)
+        if (!($this->checkIfNewBattery($jo)))
             return;
 
         // customer vehicle
@@ -2283,6 +2283,14 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             ->setWarrantyExpiration($warr_date);
     }
 
+    public function checkIfNewBattery(JobOrder $jo)
+    {
+        if ($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW)
+            return true;
+
+        return false;
+    }
+
     protected function fillDropdownParameters(&$params)
     {
         $em = $this->em;
diff --git a/src/Service/JobOrderHandlerInterface.php b/src/Service/JobOrderHandlerInterface.php
index 92eb40da..5593d10c 100644
--- a/src/Service/JobOrderHandlerInterface.php
+++ b/src/Service/JobOrderHandlerInterface.php
@@ -95,4 +95,7 @@ interface JobOrderHandlerInterface
 
     // update customer vehicle battery warranty info
     public function updateVehicleBattery(JobOrder $jo);
+
+    // check if service type is new battery
+    public function checkIfNewBattery(JobOrder $jo);
 }
diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index 4baf1cb7..3c0236e1 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -524,7 +524,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
         $this->em->flush();
 
         // create warranty
-        if ($jo->getServiceType() == CMBServiceType::BATTERY_REPLACEMENT_NEW) 
+        if($this->jo_handler->checkIfNewBattery($jo))
         {
             $serial = $jo->getCustomerVehicle()->getWarrantyCode();
             $warranty_class = $jo->getWarrantyClass();
diff --git a/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php b/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
index a9ffc1b5..b5bed63b 100644
--- a/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
@@ -523,7 +523,7 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
         $this->em->flush();
 
         // create warranty
-        if ($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW) 
+        if($this->jo_handler->checkIfNewBattery($jo))
         {
             $serial = null;
             $warranty_class = $jo->getWarrantyClass();