diff --git a/lib/drupal_soap_client.inc b/lib/drupal_soap_client.inc
index 1683210..57de0bb 100644
--- a/lib/drupal_soap_client.inc
+++ b/lib/drupal_soap_client.inc
@@ -15,23 +15,23 @@ class DrupalSoapClient {
   private $client  = NULL;
   private $options = array();
   private $library = '';
-  
+
   function __construct($library, $client, $options) {
     $this->library = $library;
     $this->client  = $client;
     $this->options = $options;
   }
-  
+
   /**
   * request a SOAP service function call. Fault, if occur, will be
   * handle and translate to an ordinary error.
-  * 
+  *
   * @param $function
   *   A string represent the function name.
-  * 
+  *
   * @param $params
   *   An array of the function's parameters.
-  * 
+  *
   * @return
   *   An array of the result with following keys:
   *   - #error  : false, if no error. Otherwise, it is the error message
@@ -41,13 +41,13 @@ class DrupalSoapClient {
     $result = array();
     $result['#error']  = FALSE;
     $result['#return'] = NULL;
-    
+
     // validate parameters
     if ( empty($function) ) {
       $result['#error'] = t('Function name is required');
       return $result;
     }
-    
+
     $params = (array) $params;
 
     if ( $this->client == NULL ) {
@@ -94,7 +94,7 @@ class DrupalSoapClient {
       if ( is_soap_fault($result['#return']) ) {
         $result['#error'] = t('Fault !code: !msg', array( '!code' => $result['#return']->faultcode, '!msg' => $result['#return']->faultstring ));
         return $result;
-      }   
+      }
     }
     else {
       // not supported library
diff --git a/soapclient.install b/soapclient.install
index 70d705b..9e99590 100644
--- a/soapclient.install
+++ b/soapclient.install
@@ -11,7 +11,6 @@
  * Implementation of hook_uninstall();
  */
 function soapclient_uninstall() {
-
   variable_del('soapclient_lib');
   variable_del('soapclient_nusoap_path');
   variable_del('soapclient_proxyhost');
diff --git a/soapclient.module b/soapclient.module
index 96c833a..93adf28 100644
--- a/soapclient.module
+++ b/soapclient.module
@@ -24,7 +24,7 @@ function soapclient_init() {
   // check, which encryption library to be used.
   $_soapclient_MCRYPT = NULL;
   $_soapclient_AES128 = NULL;
-  
+
   if ( ! extension_loaded('mcrypt') ) {
     // try loading the mcrypt
     $ext = ( drupal_strtoupper( drupal_substr(PHP_OS, 0, 3) ) === 'WIN' ) ? 'php_mcrypt.dll' : 'mcrypt.so';
@@ -35,7 +35,7 @@ function soapclient_init() {
       return;
     }
   }
-  
+
   $_soapclient_MCRYPT = mcrypt_module_open(MCRYPT_3DES, '', 'cbc', '');
 }
 
@@ -44,7 +44,7 @@ function soapclient_init() {
  */
 function soapclient_exit($destination = NULL) {
   global $_soapclient_MCRYPT;
-  
+
   if ( $_soapclient_MCRYPT != NULL ) {
     mcrypt_module_close($_soapclient_MCRYPT);
     $_soapclient_MCRYPT = NULL;
@@ -143,7 +143,7 @@ function soapclient_find_nusoap_library() {
   }
   return $nusoap_libs;
 }
-    
+
 // configuration form
 function soapclient_config() {
 
@@ -162,7 +162,7 @@ function soapclient_config() {
                     '!soapmode' => $_soapclient_LIBRARY == 'auto' ? ' (auto)': '',
                     '!cryptlib' => $_soapclient_MCRYPT != NULL ? 'mcrypt extension' : 'AES128 bundled library',
                   )
-                ),  
+                ),
   );
 
   $form['soapclient_lib'] = array(
@@ -293,7 +293,7 @@ function soapclient_config() {
 // SOAP testing form
 function soapclient_test() {
   $_soapclient_LIBRARY = variable_get('soapclient_lib', 'auto');
-  
+
   $libinfo = soapclient_get_libname();
 
   $form['library'] = array(
@@ -328,7 +328,7 @@ function soapclient_test() {
     '#maxlength'   => 256,
     '#description' => t('If WSDL is <strong>not</strong> used, enter the target namespace URI here. Otherwise, leave it blank.'),
   );
-  
+
   $form['use'] = array(
     '#type'  => 'radios',
     '#title' => 'Use',
@@ -369,7 +369,7 @@ function soapclient_test() {
   );
 
   $form['#submit'][] ='soapclient_test_submit';
-  
+
   return $form;
 }
 
@@ -377,12 +377,12 @@ function soapclient_test() {
 function soapclient_test_submit($form, $form_state) {
   $param_str = preg_replace('/[\s]*=[\s]*/', '=', $form['arguments']['#value']);
   $params    = split("\n", $param_str);
-  
+
   $args = array();
 
   foreach ($params as $param) {
     list($name, $value) = split('=', $param);
-    
+
     if ( isset($value) ) {
       $args[$name] = trim($value);
     }
@@ -390,22 +390,22 @@ function soapclient_test_submit($form, $form_state) {
       $args[] = trim($name);
     }
   }
-  
+
   $options = array();
-  
+
   $options['namespace'] = $form['namespace']['#value'];
   $options['use']       = ( $form['use']['#value']   == 0 ? 'encoded' : 'literal' );
-  $options['style']     = ( $form['style']['#value'] == 0 ? 'rpc'     : 'document');  
-  
+  $options['style']     = ( $form['style']['#value'] == 0 ? 'rpc'     : 'document');
+
   $result = soapclient_init_client($form['endpoint']['#value'], $form['wsdl']['#value'], $options);
-  
+
   if ( $result['#error'] !== FALSE ) {
     drupal_set_message(t('<h2>Error!</h2><pre>!msg</pre>', array('!msg' => $result['#error'])), 'error');
     return;
   }
-  
+
   $result = $result['#return']->call($form['function']['#value'], $args);
-  
+
   if ( $result['#error'] !== FALSE ) {
     drupal_set_message(t('<h2>Error!</h2><pre>!msg</pre>', array('!msg' => $result['#error'])), 'error');
   }
@@ -444,7 +444,7 @@ function soapclient_get_libname() {
     }
   }
   $info = array();
-  
+
   switch ($_soapclient_LIBRARY) {
     case 'PHP5SOAP':
       $info['lib']  = 'PHP5SOAP';
@@ -479,15 +479,15 @@ function soapclient_get_libname() {
 function soapclient_get_encryption() {
   global $_soapclient_MCRYPT;
   global $_soapclient_AES128;
-  
+
   if ( $_soapclient_MCRYPT != NULL ) {
     return 'MCRYPT';
   }
-  
+
   if ( $_soapclient_AES128 != NULL ) {
     return 'AES128';
   }
-  
+
   return 'Error';
 }
 
@@ -497,8 +497,8 @@ function soapclient_get_encryption() {
  *
  * @param  $var
  *   A string to check if for empty.
- * 
- * @return 
+ *
+ * @return
  *   Returns BOOLEN FALSE if $var is empty or contains only a white space string
  */
 function soapclient_empty_string($var) {
@@ -564,9 +564,9 @@ function soapclient_init_client($endpoint, $use_wsdl, $options = array()) {
 
   $client = NULL;
   $result = array();
-  $result['#error']  = FALSE;  
+  $result['#error']  = FALSE;
   $result['#return'] = $client;
-    
+
   if ( empty($endpoint) ) {
     $result['#error'] = t('Service endpoint is empty!');
     return $result;
@@ -577,14 +577,14 @@ function soapclient_init_client($endpoint, $use_wsdl, $options = array()) {
     $result['#error'] = t("Invalid 'use' value - {$options['use']}. Valid values are 'literal' or 'encoded')");
     return $result;
   }
-  
+
   if ( isset($options['style']) && ! in_array($options['style'], array('rpc', 'document')) ) {
     $result['#error'] = t("Invalid 'style' value - {$options['style']}. Valid values are 'rpc' or 'document')");
     return $result;
   }
 
   $options = (array) $options;
-  
+
   $proxyhost = variable_get('soapclient_proxyhost', '');
   if (soapclient_empty_string($proxyhost)) $proxyhost = NULL;
   $proxyport = variable_get('soapclient_proxyport', '');
@@ -618,7 +618,7 @@ function soapclient_init_client($endpoint, $use_wsdl, $options = array()) {
     $reqtimeout = variable_get('soapclient_reqtimeout', 10);
     $reptimeout = variable_get('soapclient_reptimeout', 30);
 
-    if ( $use_wsdl ) {        
+    if ( $use_wsdl ) {
       // load from cache first
       $cache = new wsdlcache(variable_get('soapclient_wsdlcache_path', variable_get('file_directory_temp', NULL)), variable_get('soapclient_wsdlcache_lifetime', 60));
       $wsdl = $cache->get($url);
@@ -628,7 +628,7 @@ function soapclient_init_client($endpoint, $use_wsdl, $options = array()) {
         $wsdl = new wsdl($endpoint, $proxyhost, $proxyport, $proxyuser, $proxypass);
         $cache->put($wsdl);
       }
-      
+
       $endpoint = $wsdl;
     }
 
@@ -662,18 +662,18 @@ function soapclient_init_client($endpoint, $use_wsdl, $options = array()) {
       }
 
       $options['location'] = $endpoint;
-      $options['uri']      = $options['namespace'];      
+      $options['uri']      = $options['namespace'];
     }
 
     $options['proxy_host']     = $proxyhost;
     $options['proxy_port']     = $proxyport;
     $options['proxy_login']    = $proxyuser;
     $options['proxy_password'] = $proxypass;
-    
+
     if ( isset($options['use']) ) {
       $options['use'] = ( $options['use'] == 'literal' ? SOAP_LITERAL : SOAP_ENCODED );
     }
-    
+
     if ( isset($options['style']) ) {
       $options['style'] = ( $options['style'] == 'document' ? SOAP_DOCUMENT : SOAP_RPC );
     }
@@ -695,7 +695,7 @@ function soapclient_init_client($endpoint, $use_wsdl, $options = array()) {
   //Load the SoapClient class definition
   module_load_include('inc', 'soapclient', 'lib/drupal_soap_client');
   $result['#return'] = new DrupalSoapClient($_soapclient_LIBRARY, $client, $options);
-  
+
   return $result;
 }
 
@@ -714,7 +714,7 @@ function soapclient_init_client($endpoint, $use_wsdl, $options = array()) {
 function soapclient_parse_xml_result($xml) {
   $input  = array();
   $result = array();
-  
+
   $result['#error']  = FALSE;
   $result['#return'] = NULL;
 
@@ -787,20 +787,20 @@ function _soapclient_parse($input, $depth = 1) {
 function soapclient_encrypt($plain, $key, $iv = 'password') {
   global $_soapclient_MCRYPT;
   global $_soapclient_AES128;
-  
+
   if ( empty($plain) ) {
     return $plain;
   }
-  
+
   if ( $_soapclient_MCRYPT != NULL ) {
     $key = drupal_substr(md5($key), 0, mcrypt_enc_get_key_size($_soapclient_MCRYPT));
     mcrypt_generic_init($_soapclient_MCRYPT, $key, drupal_substr($iv, 0, 8));
     $ct = bin2hex(mcrypt_generic($_soapclient_MCRYPT, $plain));
     mcrypt_generic_deinit($_soapclient_MCRYPT);
   }
-  else {    
+  else {
     $key = $_soapclient_AES128->makeKey(md5($key, TRUE)); // to ensure that key is 128-bytes length
-    
+
     $ct = array();
 
     // block encryption
@@ -811,12 +811,12 @@ function soapclient_encrypt($plain, $key, $iv = 'password') {
 
       $ct[] = sprintf("%02d", $bl) . bin2hex($_soapclient_AES128->blockEncrypt(drupal_substr($st, 0, $bl), $key));
     }
-    
-    $ct = implode("\n", $ct);    
+
+    $ct = implode("\n", $ct);
   }
-  
+
   return $ct;
-} 
+}
 
 /**
  * decrypt text, encrypted by soapclient_encrypt
@@ -838,20 +838,20 @@ function soapclient_encrypt($plain, $key, $iv = 'password') {
 function soapclient_decrypt($cipher, $key, $iv = 'password') {
   global $_soapclient_MCRYPT;
   global $_soapclient_AES128;
-  
+
   if ( empty($cipher) ) {
     return $cipher;
   }
-  
+
   if ( $_soapclient_MCRYPT != NULL ) {
     $key = drupal_substr(md5($key), 0, mcrypt_enc_get_key_size($_soapclient_MCRYPT));
     mcrypt_generic_init($_soapclient_MCRYPT, $key, drupal_substr($iv, 0, 8));
     $pt = mdecrypt_generic($_soapclient_MCRYPT, pack("H*", $cipher));
-    
+
     if ( strpos($pt, "\0") > 0 ) {
       $pt = drupal_substr($pt, 0, strpos($pt, "\0"));
     }
-    
+
     mcrypt_generic_deinit($_soapclient_MCRYPT);
   }
   else {
@@ -859,7 +859,7 @@ function soapclient_decrypt($cipher, $key, $iv = 'password') {
 
     $pt = '';
     $ct = explode("\n", $cipher);
-    
+
     for ( $i = 0; $i < count($ct); $i++ ) {
       $st = $_soapclient_AES128->blockDecrypt(pack("H*", drupal_substr($ct[$i], 2)), $key);
 
@@ -871,4 +871,4 @@ function soapclient_decrypt($cipher, $key, $iv = 'password') {
     }
   }
   return $pt;
-}
\ No newline at end of file
+}