Index: branches/5.3.x/units/shipping_quote_engines/usps.php
===================================================================
diff -u -N -r15925 -r16522
--- branches/5.3.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 15925)
+++ branches/5.3.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 16522)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: usps.php 15925 2013-07-30 10:02:36Z alex $
+* @version	$Id: usps.php 16522 2017-01-20 20:28:16Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -757,11 +757,11 @@
 
 		// parse response
 
+		/** @var kXMLHelper $xml_helper */
 		$xml_helper = $this->Application->recallObject('kXMLHelper');
-		/* @var $xml_helper kXMLHelper */
 
+		/** @var kXMLNode $root_node */
 		$root_node =& $xml_helper->Parse($body);
-		/* @var $root_node kXMLNode */
 
 		$rates = Array();
 		// Domestic shipping
@@ -957,8 +957,9 @@
 
 		// parse response
 		$xml_helper = $this->Application->recallObject('kXMLHelper');
+
+		/** @var kXMLNode $root_node */
 		$root_node =& $xml_helper->Parse($body);
-		/* @var $root_node kXMLNode */
 		$Postage = 0;
 
 		$label_file = $TrackingNumber = $PostnetBarCode = '';
@@ -1000,8 +1001,8 @@
 		}
 
 		if ( $label_file != '' ) {
+			/** @var FileHelper $file_helper */
 			$file_helper = $this->Application->recallObject('FileHelper');
-			/* @var $file_helper FileHelper */
 
 			$file_helper->CheckFolder(USPS_LABEL_FOLDER);
 
@@ -1014,8 +1015,8 @@
 
 	function GetUSPSCountry($country, $default = 'US')
 	{
+		/** @var kCountryStatesHelper $cs_helper */
 		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-		/* @var $cs_helper kCountryStatesHelper */
 
 		$country = $cs_helper->getCountryIso($country);
 
@@ -1100,8 +1101,9 @@
 			}
 
 			$xml_helper = $this->Application->recallObject('kXMLHelper');
+
+			/** @var kXMLNode $root_node */
 			$root_node =& $xml_helper->Parse($body);
-			/* @var $root_node kXMLNode */
 
 			// Tracking Shipping
 			$delivery_node =& $root_node->FindChild('TrackInfo');