diff --git a/src/main/java/com/microsoft/store/partnercenter/entitlements/EntitlementCollectionOperations.java b/src/main/java/com/microsoft/store/partnercenter/entitlements/EntitlementCollectionOperations.java
index d05914b..7f20945 100644
--- a/src/main/java/com/microsoft/store/partnercenter/entitlements/EntitlementCollectionOperations.java
+++ b/src/main/java/com/microsoft/store/partnercenter/entitlements/EntitlementCollectionOperations.java
@@ -58,7 +58,6 @@ public IEntireEntityCollectionRetrievalOperations<Entitlement, ResourceCollectio
     /**
      * Gets the entitlements for a customer.
      * 
-     * @param  A flag to indicate if the expiry date is required to be returned along with the entitlement (if applicable).
      * @return The collection of entitlements for the customer.
      */
 	@Override
diff --git a/src/main/java/com/microsoft/store/partnercenter/invoices/EstimateCollectionOperations.java b/src/main/java/com/microsoft/store/partnercenter/invoices/EstimateCollectionOperations.java
index 8a70841..ab14559 100644
--- a/src/main/java/com/microsoft/store/partnercenter/invoices/EstimateCollectionOperations.java
+++ b/src/main/java/com/microsoft/store/partnercenter/invoices/EstimateCollectionOperations.java
@@ -28,6 +28,8 @@ public EstimateCollectionOperations(IPartner rootPartnerOperations)
 
     /**
      * Gets the estimate links of the recon line items.
+     * 
+     * @return The estimate links of the recon line items.
      */
     @Override
     public IEstimateLink getLinks() 
diff --git a/src/main/java/com/microsoft/store/partnercenter/invoices/IEstimateCollection.java b/src/main/java/com/microsoft/store/partnercenter/invoices/IEstimateCollection.java
index 1df57e0..eb2bf66 100644
--- a/src/main/java/com/microsoft/store/partnercenter/invoices/IEstimateCollection.java
+++ b/src/main/java/com/microsoft/store/partnercenter/invoices/IEstimateCollection.java
@@ -16,7 +16,9 @@ public interface IEstimateCollection
     extends IPartnerComponent<String>
 {
     /**
-     * Gets the estimate links of the recon line items.
+     * Gets the estimate links for the recon line items.
+     * 
+     * @return The estimate links for the recon line items.
      */
     IEstimateLink getLinks();
 }
\ No newline at end of file
diff --git a/src/main/java/com/microsoft/store/partnercenter/invoices/IInvoice.java b/src/main/java/com/microsoft/store/partnercenter/invoices/IInvoice.java
index f79aa54..80b1797 100644
--- a/src/main/java/com/microsoft/store/partnercenter/invoices/IInvoice.java
+++ b/src/main/java/com/microsoft/store/partnercenter/invoices/IInvoice.java
@@ -38,7 +38,8 @@ public interface IInvoice
      * 
      * @param billingProvider The billing provider.
      * @param invoiceLineItemType The invoice line item type.
-     * @return The invoice line item collection operations.
+     * 
+     * @return The available invoice line item collection operations given a billing provider and invoice line item type.
      */
     IInvoiceLineItemCollection by(BillingProvider billingProvider, InvoiceLineItemType invoiceLineItemType);
  
@@ -49,6 +50,8 @@ public interface IInvoice
      * @param invoiceLineItemType The type of invoice line item type.
      * @param currencyCode The currency code.
      * @param period The period for unbilled recon.
+     * 
+     * @return The available invoice line item collection operations given a billing provider and invoice line item type.
      */
     IReconLineItemCollection By(BillingProvider provider, InvoiceLineItemType invoiceLineItemType, String currencyCode, BillingPeriod period);
 
@@ -60,6 +63,8 @@ public interface IInvoice
      * @param currencyCode The currency code.
      * @param period The period for unbilled recon.
      * @param pageSize The number of records returned in a single operation.
+     * 
+     * @return The available invoice line item collection operations given a billing provider and invoice line item type.
      */
     IReconLineItemCollection By(BillingProvider provider, InvoiceLineItemType invoiceLineItemType, String currencyCode, BillingPeriod period, int pageSize);
 }
\ No newline at end of file
diff --git a/src/main/java/com/microsoft/store/partnercenter/invoices/InvoiceOperations.java b/src/main/java/com/microsoft/store/partnercenter/invoices/InvoiceOperations.java
index ebc5ff4..51d8009 100644
--- a/src/main/java/com/microsoft/store/partnercenter/invoices/InvoiceOperations.java
+++ b/src/main/java/com/microsoft/store/partnercenter/invoices/InvoiceOperations.java
@@ -79,7 +79,6 @@ public IInvoiceLineItemCollection by( BillingProvider billingProvider, InvoiceLi
      * @param invoiceLineItemType The type of invoice line item type.
      * @param currencyCode The currency code.
      * @param period The period for unbilled recon.
-     * @param pageSize The number of records returned in a single operation.
      */
 	public IReconLineItemCollection By(BillingProvider provider, InvoiceLineItemType invoiceLineItemType, String currencyCode, BillingPeriod period)
 	{
diff --git a/src/main/java/com/microsoft/store/partnercenter/invoices/ReceiptCollectionOperations.java b/src/main/java/com/microsoft/store/partnercenter/invoices/ReceiptCollectionOperations.java
index 37dd5fd..ca60a65 100644
--- a/src/main/java/com/microsoft/store/partnercenter/invoices/ReceiptCollectionOperations.java
+++ b/src/main/java/com/microsoft/store/partnercenter/invoices/ReceiptCollectionOperations.java
@@ -19,7 +19,6 @@ public class ReceiptCollectionOperations
 	 * 
 	 * @param rootPartnerOperations The root partner operations instance.
 	 * @param invoiceId The invoice identifier.
-     * @param receiptId
 	 */
 	public ReceiptCollectionOperations(IPartner rootPartnerOperations, String invoiceId)
 	{
diff --git a/src/main/java/com/microsoft/store/partnercenter/invoices/ReceiptStatementOperations.java b/src/main/java/com/microsoft/store/partnercenter/invoices/ReceiptStatementOperations.java
index d735f71..e3c0443 100644
--- a/src/main/java/com/microsoft/store/partnercenter/invoices/ReceiptStatementOperations.java
+++ b/src/main/java/com/microsoft/store/partnercenter/invoices/ReceiptStatementOperations.java
@@ -25,7 +25,7 @@ public class ReceiptStatementOperations
 	 * 
 	 * @param rootPartnerOperations The root partner operations instance.
 	 * @param invoiceId The invoice identifier.
-     * @param receiptId
+     * @param receiptId The receipt identifier. 
 	 */
 	public ReceiptStatementOperations(IPartner rootPartnerOperations, String invoiceId, String receiptId)
 	{
diff --git a/src/main/java/com/microsoft/store/partnercenter/models/entitlements/Entitlement.java b/src/main/java/com/microsoft/store/partnercenter/models/entitlements/Entitlement.java
index 24585ed..d3cbd05 100644
--- a/src/main/java/com/microsoft/store/partnercenter/models/entitlements/Entitlement.java
+++ b/src/main/java/com/microsoft/store/partnercenter/models/entitlements/Entitlement.java
@@ -105,6 +105,8 @@ public void setExpiryDate(DateTime value)
 
 	/**
 	 * Gets the fulfillment state for the entitlement.
+	 * 
+	 * @return The fulfillment state for the entitlement.
 	 */
 	public String getFulfillmentState()
 	{
diff --git a/src/main/java/com/microsoft/store/partnercenter/models/orders/OrderLinks.java b/src/main/java/com/microsoft/store/partnercenter/models/orders/OrderLinks.java
index c5dbc0b..947bd01 100644
--- a/src/main/java/com/microsoft/store/partnercenter/models/orders/OrderLinks.java
+++ b/src/main/java/com/microsoft/store/partnercenter/models/orders/OrderLinks.java
@@ -39,7 +39,6 @@ public Link getPatchOperation()
      * Sets the link to the patch operation of an order.
      * 
      * @param value The link to the patch operation of an order.
-     * @return The link to the patch operation of an order.
      */
     public void setPatchOperation(Link value)
     {
@@ -60,7 +59,6 @@ public Link getProvisioningStatus()
      * Sets the link to the provisioning status of an order.
      * 
      * @param value The link to the provisioning status of an order.
-     * @return The link to the provisioning status of an order.
      */
     public void setProvisioningStatus(Link value)
     {
diff --git a/src/main/java/com/microsoft/store/partnercenter/orders/IOrderLineItem.java b/src/main/java/com/microsoft/store/partnercenter/orders/IOrderLineItem.java
index c859cd2..e0e09df 100644
--- a/src/main/java/com/microsoft/store/partnercenter/orders/IOrderLineItem.java
+++ b/src/main/java/com/microsoft/store/partnercenter/orders/IOrderLineItem.java
@@ -17,6 +17,8 @@ public interface IOrderLineItem
 {
     /**
      * Gets the available customer order line item activation link operations.
+     * 
+     * @return The available customer order line item activation link operations.
      */
     IOrderLineItemActivationLink getActivationLink();
 }
\ No newline at end of file