diff --git a/com/checkout/ApiServices/Charges/ChargesMapper.php b/com/checkout/ApiServices/Charges/ChargesMapper.php
index 8ba0cfc..395f601 100644
--- a/com/checkout/ApiServices/Charges/ChargesMapper.php
+++ b/com/checkout/ApiServices/Charges/ChargesMapper.php
@@ -67,11 +67,11 @@ public function requestPayloadConverter($requestModel = null )
 			}
 			
 			if(method_exists($requestModel,'getChargeMode') && $requestModel->getChargeMode()) {
-			    $requestPayload['chargeMode'] = $requestModel->getChargeMode();
+				$requestPayload['chargeMode'] = $requestModel->getChargeMode();
 			}
 
 			if(method_exists($requestModel,'getRiskCheck') && $requestModel->getRiskCheck()) {
-			    $requestPayload['riskCheck'] = $requestModel->getRiskCheck();
+				$requestPayload['riskCheck'] = $requestModel->getRiskCheck();
 			}
 
 			if(method_exists($requestModel,'getAttemptN3D') && $requestModel->getAttemptN3D()) {
@@ -79,11 +79,11 @@ public function requestPayloadConverter($requestModel = null )
 			}
 
 			if(method_exists($requestModel,'getSuccessUrl') && $requestModel->getSuccessUrl()) {
-			    $requestPayload['successUrl'] = $requestModel->getSuccessUrl();
+				$requestPayload['successUrl'] = $requestModel->getSuccessUrl();
 			}
 
 			if(method_exists($requestModel,'getFailUrl') && $requestModel->getFailUrl()) {
-			    $requestPayload['failUrl'] = $requestModel->getFailUrl();
+				$requestPayload['failUrl'] = $requestModel->getFailUrl();
 			}
 
 			if(method_exists($requestModel,'getChargeId') && $requestModel->getChargeId()) {
@@ -132,15 +132,15 @@ public function requestPayloadConverter($requestModel = null )
 			}
 
 			if(method_exists($requestModel,'getAutoCapTime') && $autoCapTime = $requestModel->getAutoCapTime()) {
-			    $requestPayload['autoCapTime'] = $autoCapTime;
+				$requestPayload['autoCapTime'] = $autoCapTime;
 			}
 
 			if(method_exists($requestModel,'getAutoCapture') && $autoCapture = $requestModel->getAutoCapture()) {
-			    $requestPayload['autoCapture'] = $autoCapture;
+				$requestPayload['autoCapture'] = $autoCapture;
 			}
 
 			if(method_exists($requestModel,'getTransactionIndicator') && $transactionIndicator = $requestModel->getTransactionIndicator()) {
-			    $requestPayload['transactionIndicator'] = $transactionIndicator;
+				$requestPayload['transactionIndicator'] = $transactionIndicator;
 			}
 
 			if( method_exists($requestModel,'getShippingDetails') && $shippingAddress = $requestModel->getShippingDetails()) {
@@ -153,36 +153,36 @@ public function requestPayloadConverter($requestModel = null )
 					'state' => $shippingAddress->getState () ,
 
 				);
-			    
+				
 				if ($shippingAddress->getPhone() != null) {
-				    $shippingAddressConfig = array_merge_recursive($shippingAddressConfig, array(
-				       'phone' => $shippingAddress->getPhone()->getPhoneDetails()
-				    	)
-				  	);
-	           	}
+					$shippingAddressConfig = array_merge_recursive($shippingAddressConfig, array(
+					   'phone' => $shippingAddress->getPhone()->getPhoneDetails()
+						)
+					);
+				}
 
-        		$requestPayload['shippingDetails'] = $shippingAddressConfig;
+				$requestPayload['shippingDetails'] = $shippingAddressConfig;
 			}
 
 			
 			if (method_exists($requestModel, 'getBillingDetails') && $billingAddress = $requestModel->getBillingDetails()) {
-			    $billingAddressConfig = array(
-			        'addressLine1' => $billingAddress->getAddressLine1(),
-			        'addressLine2' => $billingAddress->getAddressLine2(),
-			        'postcode' => $billingAddress->getPostcode(),
-			        'country' => $billingAddress->getCountry(),
-			        'city' => $billingAddress->getCity(),
-			        'state' => $billingAddress->getState(),
-			    );
-
-			    if ($billingAddress->getPhone() != null) {
-			        $billingAddressConfig = array_merge_recursive($billingAddressConfig, array(
+				$billingAddressConfig = array(
+					'addressLine1' => $billingAddress->getAddressLine1(),
+					'addressLine2' => $billingAddress->getAddressLine2(),
+					'postcode' => $billingAddress->getPostcode(),
+					'country' => $billingAddress->getCountry(),
+					'city' => $billingAddress->getCity(),
+					'state' => $billingAddress->getState(),
+				);
+
+				if ($billingAddress->getPhone() != null) {
+					$billingAddressConfig = array_merge_recursive($billingAddressConfig, array(
 						'phone' => $billingAddress->getPhone()->getPhoneDetails()
-						    )
-			        );
-			    }
+							)
+					);
+				}
 
-			    $requestPayload['billingDetails'] = $billingAddressConfig;
+				$requestPayload['billingDetails'] = $billingAddressConfig;
 			}
 
 			if(method_exists($requestModel,'getProducts') && $productsItem =  $requestModel->getProducts()) {
@@ -234,13 +234,13 @@ public function requestPayloadConverter($requestModel = null )
 						'city'         => $billingAddress->getCity () ,
 						'state'        => $billingAddress->getState () ,
 					);
-			        if($billingAddress->getPhone () != null){
-			          $billingAddressConfig = array_merge_recursive ( $billingAddressConfig , 
+					if($billingAddress->getPhone () != null){
+					  $billingAddressConfig = array_merge_recursive ( $billingAddressConfig , 
 						  array (
-						    'phone' => $billingAddress->getPhone()->getPhoneDetails() 
+							'phone' => $billingAddress->getPhone()->getPhoneDetails() 
 						  )
-			          );
-			        }
+					  );
+					}
 					$requestPayload[ 'card' ][ 'billingDetails' ] = $billingAddressConfig;
 				}
 
@@ -282,49 +282,49 @@ public function requestPayloadConverter($requestModel = null )
 			}
 
 			if(method_exists($requestModel,'getPaymentPlans') ) {
-			    $paymentPlans = $requestModel->getPaymentPlans();
+				$paymentPlans = $requestModel->getPaymentPlans();
 
-			    foreach($paymentPlans as $singlePlan) {
+				foreach($paymentPlans as $singlePlan) {
 
-			        $requestSinglePaymentPlan = array();
+					$requestSinglePaymentPlan = array();
 
-			        if (method_exists($singlePlan, 'getName') && ($name = $singlePlan->getName())) {
+					if (method_exists($singlePlan, 'getName') && ($name = $singlePlan->getName())) {
 						$requestSinglePaymentPlan['name'] = $name;
-			        }
+					}
 
-			        if (method_exists($singlePlan, 'getPlanTrackId') && ($planTrackId = $singlePlan->getPlanTrackId())) {
+					if (method_exists($singlePlan, 'getPlanTrackId') && ($planTrackId = $singlePlan->getPlanTrackId())) {
 						$requestSinglePaymentPlan['planTrackId'] = $planTrackId;
-			        }
+					}
 
-			        if (method_exists($singlePlan, 'getAutoCapTime') && ($autoCapTime = $singlePlan->getAutoCapTime())) {
+					if (method_exists($singlePlan, 'getAutoCapTime') && ($autoCapTime = $singlePlan->getAutoCapTime())) {
 						$requestSinglePaymentPlan['autoCapTime'] = $autoCapTime;
-			        }
+					}
 
-			        if (method_exists($singlePlan, 'getCurrency') && ($currency = $singlePlan->getCurrency())) {
+					if (method_exists($singlePlan, 'getCurrency') && ($currency = $singlePlan->getCurrency())) {
 						$requestSinglePaymentPlan['currency'] = $currency;
-			        }
+					}
 
-			        if (method_exists($singlePlan, 'getValue') && ($value = $singlePlan->getValue())) {
+					if (method_exists($singlePlan, 'getValue') && ($value = $singlePlan->getValue())) {
 						$requestSinglePaymentPlan['value'] = $value;
-			        }
-			        if (method_exists($singlePlan, 'getCycle') && ($cycle = $singlePlan->getCycle())) {
+					}
+					if (method_exists($singlePlan, 'getCycle') && ($cycle = $singlePlan->getCycle())) {
 						$requestSinglePaymentPlan['cycle'] = $cycle;
-			        }
+					}
 
-			        if (method_exists($singlePlan, 'getRecurringCount') && ($recurringCount = $singlePlan->getRecurringCount())) {
+					if (method_exists($singlePlan, 'getRecurringCount') && ($recurringCount = $singlePlan->getRecurringCount())) {
 						$requestSinglePaymentPlan['recurringCount'] = $recurringCount;
-			        }
+					}
 
-			        if (method_exists($singlePlan, 'getPlanId') && ($planId = $singlePlan->getPlanId())) {
+					if (method_exists($singlePlan, 'getPlanId') && ($planId = $singlePlan->getPlanId())) {
 						$requestSinglePaymentPlan['planId'] = $planId;
-			        }
+					}
 
-			        if (method_exists($singlePlan, 'getStartDate') && ($startDate = $singlePlan->getStartDate())) {
+					if (method_exists($singlePlan, 'getStartDate') && ($startDate = $singlePlan->getStartDate())) {
 						$requestSinglePaymentPlan['startDate'] = $startDate;
-			        }
+					}
 
-			        $requestPayload['paymentPlans'][] = $requestSinglePaymentPlan;
-			    }
+					$requestPayload['paymentPlans'][] = $requestSinglePaymentPlan;
+				}
 			}
 
 		}