diff --git a/tools/@angular/tsc-wrapped/index.ts b/tools/@angular/tsc-wrapped/index.ts
index fee8cafcde..20a85116e6 100644
--- a/tools/@angular/tsc-wrapped/index.ts
+++ b/tools/@angular/tsc-wrapped/index.ts
@@ -1,5 +1,6 @@
-export {TsickleHost, MetadataWriterHost} from './src/compiler_host';
-export {main, CodegenExtension} from './src/main';
+export {MetadataWriterHost, TsickleHost} from './src/compiler_host';
+export {CodegenExtension, main} from './src/main';
+
 export {default as AngularCompilerOptions} from './src/options';
 export * from './src/collector';
 export * from './src/schema';
diff --git a/tools/@angular/tsc-wrapped/src/collector.ts b/tools/@angular/tsc-wrapped/src/collector.ts
index 83c1eda9b7..9f83117bec 100644
--- a/tools/@angular/tsc-wrapped/src/collector.ts
+++ b/tools/@angular/tsc-wrapped/src/collector.ts
@@ -1,9 +1,10 @@
 import * as ts from 'typescript';
 
 import {Evaluator, ImportMetadata, ImportSpecifierMetadata, errorSymbol, isPrimitive} from './evaluator';
-import {ClassMetadata, ConstructorMetadata, ModuleMetadata, MemberMetadata, MetadataError, MetadataMap, MetadataSymbolicExpression, MetadataSymbolicReferenceExpression, MetadataValue, MethodMetadata, isMetadataError, isMetadataSymbolicReferenceExpression, VERSION} from './schema';
+import {ClassMetadata, ConstructorMetadata, MemberMetadata, MetadataError, MetadataMap, MetadataSymbolicExpression, MetadataSymbolicReferenceExpression, MetadataValue, MethodMetadata, ModuleMetadata, VERSION, isMetadataError, isMetadataSymbolicReferenceExpression} from './schema';
 import {Symbols} from './symbols';
 
+
 /**
  * Collect decorator metadata from a TypeScript module.
  */
diff --git a/tools/@angular/tsc-wrapped/src/main.ts b/tools/@angular/tsc-wrapped/src/main.ts
index 95d6cf6b8d..175cea7230 100644
--- a/tools/@angular/tsc-wrapped/src/main.ts
+++ b/tools/@angular/tsc-wrapped/src/main.ts
@@ -1,7 +1,9 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
-import {tsc, check} from './tsc';
+
+import {check, tsc} from './tsc';
+
 import NgOptions from './options';
 import {MetadataWriterHost, TsickleHost} from './compiler_host';
 
diff --git a/tools/@angular/tsc-wrapped/test/collector.spec.ts b/tools/@angular/tsc-wrapped/test/collector.spec.ts
index 0e6655b079..ec27d3225a 100644
--- a/tools/@angular/tsc-wrapped/test/collector.spec.ts
+++ b/tools/@angular/tsc-wrapped/test/collector.spec.ts
@@ -1,8 +1,9 @@
 import * as ts from 'typescript';
+
 import {MetadataCollector} from '../src/collector';
 import {ClassMetadata, ConstructorMetadata, ModuleMetadata} from '../src/schema';
 
-import {Directory, expectValidSources, Host} from './typescript.mocks';
+import {Directory, Host, expectValidSources} from './typescript.mocks';
 
 describe('Collector', () => {
   let host: ts.LanguageServiceHost;
diff --git a/tools/tsc-watch/index.ts b/tools/tsc-watch/index.ts
index fee1d08537..5323019307 100644
--- a/tools/tsc-watch/index.ts
+++ b/tools/tsc-watch/index.ts
@@ -1,7 +1,7 @@
 import {spawn} from 'child_process';
-import {writeFileSync, mkdirSync, existsSync} from 'fs';
+import {existsSync, mkdirSync, writeFileSync} from 'fs';
 
-import {TscWatch, TSC, reportError} from './tsc_watch';
+import {TSC, TscWatch, reportError} from './tsc_watch';
 
 export * from './tsc_watch';
 import 'reflect-metadata';