diff --git a/includes/abstracts/abstract-wc-order.php b/includes/abstracts/abstract-wc-order.php
index 8cabfc6eeab..e52fcd73e34 100644
--- a/includes/abstracts/abstract-wc-order.php
+++ b/includes/abstracts/abstract-wc-order.php
@@ -10,6 +10,7 @@
  * @package     WooCommerce/Classes
  * @category    Class
  * @author      WooThemes
+ * @property    string $billing_first_name The billing address first name
  */
 abstract class WC_Abstract_Order {
 
diff --git a/includes/admin/meta-boxes/views/html-order-fee.php b/includes/admin/meta-boxes/views/html-order-fee.php
index 87c7e3e4c23..93d22f0b9d6 100644
--- a/includes/admin/meta-boxes/views/html-order-fee.php
+++ b/includes/admin/meta-boxes/views/html-order-fee.php
@@ -3,6 +3,7 @@
  * Shows an order item fee
  *
  * @var int $item_id The id of the item being displayed
+ * @property $item The item being displayed
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -15,10 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 	<td class="name">
 		<div class="view">
-			<?php
-				/* @var $item The item being displayed */
-				echo ! empty( $item['name'] ) ? esc_html( $item['name'] ) : __( 'Fee', 'woocommerce' );
-			?>
+			<?php echo ! empty( $item['name'] ) ? esc_html( $item['name'] ) : __( 'Fee', 'woocommerce' ); ?>
 		</div>
 		<div class="edit" style="display: none;">
 			<input type="text" placeholder="<?php _e( 'Fee Name', 'woocommerce' ); ?>" name="order_item_name[<?php echo absint( $item_id ); ?>]" value="<?php echo ( isset( $item['name'] ) ) ? esc_attr( $item['name'] ) : ''; ?>" />
@@ -27,10 +25,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 		</div>
 	</td>
 
-	<?php
-		/* @var $item The item being displayed */
-		do_action( 'woocommerce_admin_order_item_values', null, $item, absint( $item_id ) );
-	?>
+	<?php do_action( 'woocommerce_admin_order_item_values', null, $item, absint( $item_id ) ); ?>
 
 	<td class="item_cost" width="1%">&nbsp;</td>
 	<td class="quantity" width="1%">&nbsp;</td>