diff --git a/lib/services/powerbiembedded/LICENSE.txt b/lib/services/powerbiembedded/LICENSE.txt
index 0313a903d7..5431ba98b9 100644
--- a/lib/services/powerbiembedded/LICENSE.txt
+++ b/lib/services/powerbiembedded/LICENSE.txt
@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 Microsoft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+The MIT License (MIT)
+
+Copyright (c) 2018 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/lib/services/powerbiembedded/lib/models/createWorkspaceCollectionRequest.js b/lib/services/powerbiembedded/lib/models/createWorkspaceCollectionRequest.js
index 62779ec095..d6f0765f9e 100644
--- a/lib/services/powerbiembedded/lib/models/createWorkspaceCollectionRequest.js
+++ b/lib/services/powerbiembedded/lib/models/createWorkspaceCollectionRequest.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * Class representing a CreateWorkspaceCollectionRequest.
  */
diff --git a/lib/services/powerbiembedded/lib/models/display.js b/lib/services/powerbiembedded/lib/models/display.js
index 685833cf65..ea814f5976 100644
--- a/lib/services/powerbiembedded/lib/models/display.js
+++ b/lib/services/powerbiembedded/lib/models/display.js
@@ -18,12 +18,12 @@ class Display {
    * Create a Display.
    * @member {string} [provider] The localized friendly form of the resource
    * provider name. This form is also expected to include the publisher/company
-   * responsible. Use Title Casing. Begin with “Microsoft” for 1st party
+   * responsible. Use Title Casing. Begin with "Microsoft" for 1st party
    * services.
    * @member {string} [resource] The localized friendly form of the resource
    * type related to this action/operation. This form should match the public
    * documentation for the resource provider. Use Title Casing. For examples,
-   * refer to the “name” section.
+   * refer to the "name" section.
    * @member {string} [operation] The localized friendly name for the operation
    * as shown to the user. This name should be concise (to fit in drop downs),
    * but clear (self-documenting). Use Title Casing and include the
diff --git a/lib/services/powerbiembedded/lib/models/errorModel.js b/lib/services/powerbiembedded/lib/models/errorModel.js
index 6e36478d6f..5eb2eab402 100644
--- a/lib/services/powerbiembedded/lib/models/errorModel.js
+++ b/lib/services/powerbiembedded/lib/models/errorModel.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * Class representing a ErrorModel.
  */
diff --git a/lib/services/powerbiembedded/lib/models/index.d.ts b/lib/services/powerbiembedded/lib/models/index.d.ts
index fc1287372d..3b443409d1 100644
--- a/lib/services/powerbiembedded/lib/models/index.d.ts
+++ b/lib/services/powerbiembedded/lib/models/index.d.ts
@@ -96,12 +96,12 @@ export interface Workspace {
  * @constructor
  * @member {string} [provider] The localized friendly form of the resource
  * provider name. This form is also expected to include the publisher/company
- * responsible. Use Title Casing. Begin with “Microsoft” for 1st party
+ * responsible. Use Title Casing. Begin with "Microsoft" for 1st party
  * services.
  * @member {string} [resource] The localized friendly form of the resource type
  * related to this action/operation. This form should match the public
  * documentation for the resource provider. Use Title Casing. For examples,
- * refer to the “name” section.
+ * refer to the "name" section.
  * @member {string} [operation] The localized friendly name for the operation
  * as shown to the user. This name should be concise (to fit in drop downs),
  * but clear (self-documenting). Use Title Casing and include the
@@ -131,12 +131,12 @@ export interface Display {
  * @member {object} [display]
  * @member {string} [display.provider] The localized friendly form of the
  * resource provider name. This form is also expected to include the
- * publisher/company responsible. Use Title Casing. Begin with “Microsoft” for
+ * publisher/company responsible. Use Title Casing. Begin with "Microsoft" for
  * 1st party services.
  * @member {string} [display.resource] The localized friendly form of the
  * resource type related to this action/operation. This form should match the
  * public documentation for the resource provider. Use Title Casing. For
- * examples, refer to the “name” section.
+ * examples, refer to the "name" section.
  * @member {string} [display.operation] The localized friendly name for the
  * operation as shown to the user. This name should be concise (to fit in drop
  * downs), but clear (self-documenting). Use Title Casing and include the
diff --git a/lib/services/powerbiembedded/lib/models/operation.js b/lib/services/powerbiembedded/lib/models/operation.js
index d5d4937559..d3a36c85bd 100644
--- a/lib/services/powerbiembedded/lib/models/operation.js
+++ b/lib/services/powerbiembedded/lib/models/operation.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * Class representing a Operation.
  */
@@ -24,12 +22,12 @@ class Operation {
    * @member {object} [display]
    * @member {string} [display.provider] The localized friendly form of the
    * resource provider name. This form is also expected to include the
-   * publisher/company responsible. Use Title Casing. Begin with “Microsoft”
+   * publisher/company responsible. Use Title Casing. Begin with "Microsoft"
    * for 1st party services.
    * @member {string} [display.resource] The localized friendly form of the
    * resource type related to this action/operation. This form should match the
    * public documentation for the resource provider. Use Title Casing. For
-   * examples, refer to the “name” section.
+   * examples, refer to the "name" section.
    * @member {string} [display.operation] The localized friendly name for the
    * operation as shown to the user. This name should be concise (to fit in
    * drop downs), but clear (self-documenting). Use Title Casing and include
diff --git a/lib/services/powerbiembedded/lib/models/operationList.js b/lib/services/powerbiembedded/lib/models/operationList.js
index 8d2e8264b4..5a6673f791 100644
--- a/lib/services/powerbiembedded/lib/models/operationList.js
+++ b/lib/services/powerbiembedded/lib/models/operationList.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * Class representing a OperationList.
  */
diff --git a/lib/services/powerbiembedded/lib/models/updateWorkspaceCollectionRequest.js b/lib/services/powerbiembedded/lib/models/updateWorkspaceCollectionRequest.js
index 80df75e330..a94b722b77 100644
--- a/lib/services/powerbiembedded/lib/models/updateWorkspaceCollectionRequest.js
+++ b/lib/services/powerbiembedded/lib/models/updateWorkspaceCollectionRequest.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * Class representing a UpdateWorkspaceCollectionRequest.
  */
diff --git a/lib/services/powerbiembedded/lib/models/workspaceCollection.js b/lib/services/powerbiembedded/lib/models/workspaceCollection.js
index ffa0307441..1c02e7b62a 100644
--- a/lib/services/powerbiembedded/lib/models/workspaceCollection.js
+++ b/lib/services/powerbiembedded/lib/models/workspaceCollection.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * Class representing a WorkspaceCollection.
  */
diff --git a/lib/services/powerbiembedded/lib/powerBIEmbeddedManagementClient.d.ts b/lib/services/powerbiembedded/lib/powerBIEmbeddedManagementClient.d.ts
index e1edbd9ac3..9706afdd10 100644
--- a/lib/services/powerbiembedded/lib/powerBIEmbeddedManagementClient.d.ts
+++ b/lib/services/powerbiembedded/lib/powerBIEmbeddedManagementClient.d.ts
@@ -13,7 +13,7 @@ import { AzureServiceClient, AzureServiceClientOptions } from 'ms-rest-azure';
 import * as models from "./models";
 import * as operations from "./operations";
 
-declare class PowerBIEmbeddedManagementClient extends AzureServiceClient {
+export default class PowerBIEmbeddedManagementClient extends AzureServiceClient {
   /**
    * Initializes a new instance of the PowerBIEmbeddedManagementClient class.
    * @constructor
@@ -34,11 +34,11 @@ declare class PowerBIEmbeddedManagementClient extends AzureServiceClient {
    *
    * @param {boolean} [options.noRetryPolicy] - If set to true, turn off default retry policy
    *
-   * @param {string} [options.acceptLanguage] - Gets or sets the preferred language for the response.
+   * @param {string} [options.acceptLanguage] - The preferred language for the response.
    *
-   * @param {number} [options.longRunningOperationRetryTimeout] - Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+   * @param {number} [options.longRunningOperationRetryTimeout] - The retry timeout in seconds for Long Running Operations. Default value is 30.
    *
-   * @param {boolean} [options.generateClientRequestId] - When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+   * @param {boolean} [options.generateClientRequestId] - Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
    *
    */
   constructor(credentials: ServiceClientCredentials, subscriptionId: string, baseUri?: string, options?: AzureServiceClientOptions);
@@ -113,4 +113,4 @@ declare class PowerBIEmbeddedManagementClient extends AzureServiceClient {
   getAvailableOperations(options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.OperationList>): void;
 }
 
-export = PowerBIEmbeddedManagementClient;
+export { PowerBIEmbeddedManagementClient, models as PowerBIEmbeddedManagementModels };
diff --git a/lib/services/powerbiembedded/lib/powerBIEmbeddedManagementClient.js b/lib/services/powerbiembedded/lib/powerBIEmbeddedManagementClient.js
index e1c3cbf9bc..a841d1ed68 100644
--- a/lib/services/powerbiembedded/lib/powerBIEmbeddedManagementClient.js
+++ b/lib/services/powerbiembedded/lib/powerBIEmbeddedManagementClient.js
@@ -166,9 +166,9 @@ class PowerBIEmbeddedManagementClient extends ServiceClient {
    * @param {object} [options.requestOptions] - Options for the underlying request object
    * {@link https://github.com/request/request#requestoptions-callback Options doc}
    * @param {boolean} [options.noRetryPolicy] - If set to true, turn off default retry policy
-   * @param {string} [options.acceptLanguage] - Gets or sets the preferred language for the response.
-   * @param {number} [options.longRunningOperationRetryTimeout] - Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
-   * @param {boolean} [options.generateClientRequestId] - When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+   * @param {string} [options.acceptLanguage] - The preferred language for the response.
+   * @param {number} [options.longRunningOperationRetryTimeout] - The retry timeout in seconds for Long Running Operations. Default value is 30.
+   * @param {boolean} [options.generateClientRequestId] - Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
    */
   constructor(credentials, subscriptionId, baseUri, options) {
     if (credentials === null || credentials === undefined) {
@@ -294,3 +294,6 @@ class PowerBIEmbeddedManagementClient extends ServiceClient {
 }
 
 module.exports = PowerBIEmbeddedManagementClient;
+module.exports['default'] = PowerBIEmbeddedManagementClient;
+module.exports.PowerBIEmbeddedManagementClient = PowerBIEmbeddedManagementClient;
+module.exports.PowerBIEmbeddedManagementModels = models;
diff --git a/lib/services/powerbiembedded/package.json b/lib/services/powerbiembedded/package.json
index 59bbde728d..a04291aedf 100644
--- a/lib/services/powerbiembedded/package.json
+++ b/lib/services/powerbiembedded/package.json
@@ -1,35 +1,25 @@
 {
   "name": "azure-arm-powerbiembedded",
   "author": "Microsoft Corporation",
-  "contributors": [
-    "Mazzola, Matt <mattm@microsoft.com>"
-  ],
+  "description": "PowerBIEmbeddedManagementClient Library with typescript type definitions for node",
   "version": "1.1.0-preview",
-  "description": "Microsoft Azure Power BI Embedded Client Library for node",
-  "tags": [
-    "azure",
-    "sdk"
-  ],
+  "dependencies": {
+    "ms-rest": "^2.3.3",
+    "ms-rest-azure": "^2.5.5"
+  },
   "keywords": [
     "node",
     "azure"
   ],
+  "license": "MIT",
   "main": "./lib/powerBIEmbeddedManagementClient.js",
   "types": "./lib/powerBIEmbeddedManagementClient.d.ts",
-  "license": "MIT",
-  "dependencies": {
-    "ms-rest": "^2.2.2",
-    "ms-rest-azure": "^2.3.3"
-  },
-  "homepage": "http://github.com/Azure/azure-sdk-for-node",
+  "homepage": "https://github.com/azure/azure-sdk-for-node/tree/master/lib/services/powerbiembedded",
   "repository": {
     "type": "git",
-    "url": "git@github.com:Azure/azure-sdk-for-node.git"
+    "url": "https://github.com/azure/azure-sdk-for-node.git"
   },
   "bugs": {
-    "url": "http://github.com/Azure/azure-sdk-for-node/issues"
-  },
-  "scripts": {
-    "test": "npm -s run-script jshint"
+    "url": "https://github.com/azure/azure-sdk-for-node/issues"
   }
-}
\ No newline at end of file
+}