diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache
index 063393affc0d..fd37bdd11941 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache
@@ -1,7 +1,7 @@
 import {Http, Headers, RequestOptionsArgs, Response, URLSearchParams} from 'angular2/http';
 import {Injectable} from 'angular2/core';
 import {Observable} from 'rxjs/Observable';
-import * as models from "../model/models.ts"
+import * as models from '../model/models';
 
 /* tslint:disable:no-unused-variable member-ordering */
 
@@ -79,7 +79,7 @@ export class {{classname}} {
         {{/hasFormParams}}
 
         return this.http.request(path, requestOptions)
-            .map(response => response.json());
+            .map((response: Response) => response.json());
     }
 
 {{/operation}}
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/index.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/index.mustache
index 84fe5a636a0c..557365516ad3 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/index.mustache
@@ -1,2 +1,2 @@
-export * from './api/apis.ts';
-export * from './model/models.ts';
\ No newline at end of file
+export * from './api/api';
+export * from './model/models';
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/model.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/model.mustache
index f32a46356211..da832ad0ba20 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/model.mustache
@@ -1,7 +1,7 @@
 {{#models}}
 {{#model}}
 'use strict';
-import * as models from "./models.ts"
+import * as models from './models.ts';
 
 {{#description}}
 /**
@@ -16,7 +16,6 @@ export interface {{classname}} {{#parent}}extends models.{{{parent}}} {{/parent}
      * {{{description}}}
      */
 {{/description}}
-
     {{name}}?: {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
 {{/vars}}
 }