diff --git a/modules/angular2/src/common/forms/directives/validators.ts b/modules/angular2/src/common/forms/directives/validators.ts
index 27bdf3a87f..fca03aa50a 100644
--- a/modules/angular2/src/common/forms/directives/validators.ts
+++ b/modules/angular2/src/common/forms/directives/validators.ts
@@ -1,9 +1,8 @@
 import {forwardRef, Provider, Attribute, Directive} from 'angular2/core';
-import {CONST_EXPR} from 'angular2/src/facade/lang';
+import {CONST_EXPR, NumberWrapper} from 'angular2/src/facade/lang';
 import {Validators, NG_VALIDATORS} from '../validators';
 import {AbstractControl} from '../model';
 import * as modelModule from '../model';
-import {NumberWrapper} from "angular2/src/facade/lang";
 
 
 
diff --git a/modules/angular2/src/compiler/runtime_metadata.ts b/modules/angular2/src/compiler/runtime_metadata.ts
index 0297132685..ea05bc88f0 100644
--- a/modules/angular2/src/compiler/runtime_metadata.ts
+++ b/modules/angular2/src/compiler/runtime_metadata.ts
@@ -38,7 +38,6 @@ import {
   HostMetadata,
   SkipSelfMetadata
 } from 'angular2/src/core/di/metadata';
-import {AttributeMetadata} from 'angular2/src/core/metadata/di';
 import {ReflectorReader} from 'angular2/src/core/reflection/reflector_reader';
 
 @Injectable()
@@ -208,7 +207,7 @@ export class RuntimeMetadataResolver {
     }
     return deps.map((dep) => {
       var compileToken;
-      var p = <AttributeMetadata>dep.properties.find(p => p instanceof AttributeMetadata);
+      var p = <dimd.AttributeMetadata>dep.properties.find(p => p instanceof dimd.AttributeMetadata);
       var isAttribute = false;
       if (isPresent(p)) {
         compileToken = this.getTokenMetadata(p.attributeName);
diff --git a/modules/angular2/src/compiler/template_parser.ts b/modules/angular2/src/compiler/template_parser.ts
index 407f0c50af..acf8842cc8 100644
--- a/modules/angular2/src/compiler/template_parser.ts
+++ b/modules/angular2/src/compiler/template_parser.ts
@@ -4,9 +4,15 @@ import {
   SetWrapper,
   MapWrapper
 } from 'angular2/src/facade/collection';
-import {RegExpWrapper, isPresent, StringWrapper, isBlank, isArray} from 'angular2/src/facade/lang';
+import {
+  CONST_EXPR,
+  RegExpWrapper,
+  isPresent,
+  StringWrapper,
+  isBlank,
+  isArray
+} from 'angular2/src/facade/lang';
 import {Injectable, Inject, OpaqueToken, Optional} from 'angular2/core';
-import {CONST_EXPR} from 'angular2/src/facade/lang';
 import {BaseException} from 'angular2/src/facade/exceptions';
 import {
   AST,
diff --git a/modules/angular2/src/compiler/url_resolver.ts b/modules/angular2/src/compiler/url_resolver.ts
index 598ed45a8d..c3f1c2fdc5 100644
--- a/modules/angular2/src/compiler/url_resolver.ts
+++ b/modules/angular2/src/compiler/url_resolver.ts
@@ -1,4 +1,4 @@
-import {Injectable, Inject} from 'angular2/src/core/di';
+import {Provider, Injectable, Inject} from 'angular2/src/core/di';
 import {
   StringWrapper,
   isPresent,
@@ -9,7 +9,6 @@ import {
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
 import {ListWrapper} from 'angular2/src/facade/collection';
 import {PACKAGE_ROOT_URL} from 'angular2/src/core/application_tokens';
-import {Provider} from 'angular2/src/core/di';
 
 const _ASSET_SCHEME = 'asset:';
 
diff --git a/modules/angular2/src/core/application_common_providers.ts b/modules/angular2/src/core/application_common_providers.ts
index 35bbc6963c..9838c9e33a 100644
--- a/modules/angular2/src/core/application_common_providers.ts
+++ b/modules/angular2/src/core/application_common_providers.ts
@@ -9,10 +9,8 @@ import {
   defaultKeyValueDiffers
 } from './change_detection/change_detection';
 import {ViewUtils} from "./linker/view_utils";
-import {ComponentResolver} from './linker/component_resolver';
-import {ReflectorComponentResolver} from "./linker/component_resolver";
-import {DynamicComponentLoader} from './linker/dynamic_component_loader';
-import {DynamicComponentLoader_} from "./linker/dynamic_component_loader";
+import {ComponentResolver, ReflectorComponentResolver} from './linker/component_resolver';
+import {DynamicComponentLoader, DynamicComponentLoader_} from './linker/dynamic_component_loader';
 
 var __unused: Type;  // avoid unused import when Type union types are erased
 
diff --git a/modules/angular2/src/core/application_ref.ts b/modules/angular2/src/core/application_ref.ts
index b2c04a5620..413601d256 100644
--- a/modules/angular2/src/core/application_ref.ts
+++ b/modules/angular2/src/core/application_ref.ts
@@ -16,7 +16,7 @@ import {PromiseWrapper, PromiseCompleter, ObservableWrapper} from 'angular2/src/
 import {ListWrapper} from 'angular2/src/facade/collection';
 import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability';
 import {ComponentResolver} from 'angular2/src/core/linker/component_resolver';
-import {ComponentRef} from 'angular2/src/core/linker/component_factory';
+import {ComponentRef, ComponentFactory} from 'angular2/src/core/linker/component_factory';
 import {
   BaseException,
   WrappedException,
@@ -26,7 +26,6 @@ import {
 import {Console} from 'angular2/src/core/console';
 import {wtfLeave, wtfCreateScope, WtfScopeFn} from './profile/profile';
 import {ChangeDetectorRef} from 'angular2/src/core/change_detection/change_detector_ref';
-import {ComponentFactory} from 'angular2/src/core/linker/component_factory';
 
 /**
  * Create an Angular zone.
diff --git a/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts b/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts
index 878f5f08ab..a028232949 100644
--- a/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts
+++ b/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts
@@ -1,8 +1,8 @@
-import {CONST} from 'angular2/src/facade/lang';
 import {BaseException} from 'angular2/src/facade/exceptions';
 import {isListLikeIterable, iterateListLike, ListWrapper} from 'angular2/src/facade/collection';
 
 import {
+  CONST,
   isBlank,
   isPresent,
   stringify,
diff --git a/modules/angular2/src/core/debug/debug_node.ts b/modules/angular2/src/core/debug/debug_node.ts
index 49163ebfde..aa6e80a865 100644
--- a/modules/angular2/src/core/debug/debug_node.ts
+++ b/modules/angular2/src/core/debug/debug_node.ts
@@ -1,7 +1,6 @@
 import {isPresent, Type} from 'angular2/src/facade/lang';
-import {Predicate} from 'angular2/src/facade/collection';
+import {Predicate, ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
 import {Injector} from 'angular2/src/core/di';
-import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
 import {RenderDebugInfo} from 'angular2/src/core/render/api';
 
 export class EventListener { constructor(public name: string, public callback: Function){}; }
diff --git a/modules/angular2/src/mock/mock_application_ref.ts b/modules/angular2/src/mock/mock_application_ref.ts
index f75d21ecbf..77bf0182b3 100644
--- a/modules/angular2/src/mock/mock_application_ref.ts
+++ b/modules/angular2/src/mock/mock_application_ref.ts
@@ -1,8 +1,7 @@
 import {ApplicationRef} from 'angular2/src/core/application_ref';
-import {Injectable} from 'angular2/src/core/di';
+import {Injectable, Injector} from 'angular2/src/core/di';
 import {Type} from 'angular2/src/facade/lang';
 import {ComponentRef, ComponentFactory} from 'angular2/src/core/linker/component_factory';
-import {Injector} from 'angular2/src/core/di';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
 
 /**
diff --git a/modules/angular2/src/platform/browser_common.ts b/modules/angular2/src/platform/browser_common.ts
index 77c92a31b3..af5adf4ab8 100644
--- a/modules/angular2/src/platform/browser_common.ts
+++ b/modules/angular2/src/platform/browser_common.ts
@@ -18,11 +18,9 @@ import {Testability} from 'angular2/src/core/testability/testability';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 import {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events';
 import {KeyEventsPlugin} from 'angular2/src/platform/dom/events/key_events';
-import {HammerGesturesPlugin} from 'angular2/src/platform/dom/events/hammer_gestures';
 import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens';
 import {DomRootRenderer, DomRootRenderer_} from 'angular2/src/platform/dom/dom_renderer';
-import {DomSharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host';
-import {SharedStylesHost} from "angular2/src/platform/dom/shared_styles_host";
+import {DomSharedStylesHost, SharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host';
 import {BrowserDetails} from "angular2/src/animate/browser_details";
 import {AnimationBuilder} from "angular2/src/animate/animation_builder";
 import {BrowserDomAdapter} from './browser/browser_adapter';
@@ -32,7 +30,8 @@ import {wtfInit} from 'angular2/src/core/profile/wtf_init';
 import {EventManager, EVENT_MANAGER_PLUGINS} from "angular2/src/platform/dom/events/event_manager";
 import {
   HAMMER_GESTURE_CONFIG,
-  HammerGestureConfig
+  HammerGestureConfig,
+  HammerGesturesPlugin
 } from 'angular2/src/platform/dom/events/hammer_gestures';
 import {ELEMENT_PROBE_PROVIDERS} from 'angular2/platform/common_dom';
 export {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens';
diff --git a/modules/angular2/src/platform/worker_render_common.ts b/modules/angular2/src/platform/worker_render_common.ts
index ef3603c7df..68a197cd24 100644
--- a/modules/angular2/src/platform/worker_render_common.ts
+++ b/modules/angular2/src/platform/worker_render_common.ts
@@ -20,11 +20,9 @@ import {provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/di';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 import {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events';
 import {KeyEventsPlugin} from 'angular2/src/platform/dom/events/key_events';
-import {HammerGesturesPlugin} from 'angular2/src/platform/dom/events/hammer_gestures';
 import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens';
 import {DomRootRenderer, DomRootRenderer_} from 'angular2/src/platform/dom/dom_renderer';
-import {DomSharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host';
-import {SharedStylesHost} from "angular2/src/platform/dom/shared_styles_host";
+import {DomSharedStylesHost, SharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host';
 import {BrowserDetails} from 'angular2/src/animate/browser_details';
 import {AnimationBuilder} from 'angular2/src/animate/animation_builder';
 import {XHR} from 'angular2/compiler';
@@ -49,7 +47,11 @@ import {
 import {Serializer} from 'angular2/src/web_workers/shared/serializer';
 import {ON_WEB_WORKER} from 'angular2/src/web_workers/shared/api';
 import {RenderStore} from 'angular2/src/web_workers/shared/render_store';
-import {HAMMER_GESTURE_CONFIG, HammerGestureConfig} from './dom/events/hammer_gestures';
+import {
+  HAMMER_GESTURE_CONFIG,
+  HammerGestureConfig,
+  HammerGesturesPlugin
+} from 'angular2/src/platform/dom/events/hammer_gestures';
 
 export const WORKER_SCRIPT: OpaqueToken = CONST_EXPR(new OpaqueToken("WebWorkerScript"));
 
diff --git a/modules/angular2/src/router/rules/rules.ts b/modules/angular2/src/router/rules/rules.ts
index af8a1e82b6..da95a826eb 100644
--- a/modules/angular2/src/router/rules/rules.ts
+++ b/modules/angular2/src/router/rules/rules.ts
@@ -6,8 +6,7 @@ import {Map} from 'angular2/src/facade/collection';
 import {RouteHandler} from './route_handlers/route_handler';
 import {Url, convertUrlParamsToArray} from '../url_parser';
 import {ComponentInstruction} from '../instruction';
-import {RoutePath} from './route_paths/route_path';
-import {GeneratedUrl} from './route_paths/route_path';
+import {RoutePath, GeneratedUrl} from './route_paths/route_path';
 
 
 // RouteMatch objects hold information about a match between a rule and a URL
diff --git a/modules/angular2/src/web_workers/shared/client_message_broker.ts b/modules/angular2/src/web_workers/shared/client_message_broker.ts
index 2b4e68fe05..b4819d5268 100644
--- a/modules/angular2/src/web_workers/shared/client_message_broker.ts
+++ b/modules/angular2/src/web_workers/shared/client_message_broker.ts
@@ -1,5 +1,12 @@
 import {MessageBus} from "angular2/src/web_workers/shared/message_bus";
-import {print, isPresent, DateWrapper, stringify} from "angular2/src/facade/lang";
+import {
+  print,
+  isPresent,
+  DateWrapper,
+  stringify,
+  Type,
+  StringWrapper
+} from "angular2/src/facade/lang";
 import {
   PromiseCompleter,
   PromiseWrapper,
@@ -9,7 +16,6 @@ import {
 import {StringMapWrapper, MapWrapper} from "angular2/src/facade/collection";
 import {Serializer} from "angular2/src/web_workers/shared/serializer";
 import {Injectable} from "angular2/src/core/di";
-import {Type, StringWrapper} from "angular2/src/facade/lang";
 export {Type} from "angular2/src/facade/lang";
 
 export abstract class ClientMessageBrokerFactory {
diff --git a/modules/angular2/test/common/forms/integration_spec.ts b/modules/angular2/test/common/forms/integration_spec.ts
index 998f7211e4..cdc8997d3f 100644
--- a/modules/angular2/test/common/forms/integration_spec.ts
+++ b/modules/angular2/test/common/forms/integration_spec.ts
@@ -1,4 +1,12 @@
-import {Component, Directive, Output, EventEmitter} from 'angular2/core';
+import {
+  Component,
+  Directive,
+  Output,
+  EventEmitter,
+  Provider,
+  forwardRef,
+  Input
+} from 'angular2/core';
 import {
   ComponentFixture,
   afterEach,
@@ -35,7 +43,6 @@ import {
   Validator,
   RadioButtonState
 } from 'angular2/common';
-import {Provider, forwardRef, Input} from 'angular2/core';
 import {By} from 'angular2/platform/browser';
 import {ListWrapper} from 'angular2/src/facade/collection';
 import {ObservableWrapper, TimerWrapper} from 'angular2/src/facade/async';
diff --git a/modules/angular2/test/compiler/runtime_metadata_spec.ts b/modules/angular2/test/compiler/runtime_metadata_spec.ts
index ab682a3de3..ec2163ec73 100644
--- a/modules/angular2/test/compiler/runtime_metadata_spec.ts
+++ b/modules/angular2/test/compiler/runtime_metadata_spec.ts
@@ -13,7 +13,7 @@ import {
   beforeEachProviders
 } from 'angular2/testing_internal';
 
-import {stringify} from 'angular2/src/facade/lang';
+import {IS_DART, stringify} from 'angular2/src/facade/lang';
 import {RuntimeMetadataResolver} from 'angular2/src/compiler/runtime_metadata';
 import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/metadata/lifecycle_hooks';
 import {
@@ -35,7 +35,6 @@ import {
 
 import {TEST_PROVIDERS} from './test_bindings';
 import {MODULE_SUFFIX} from 'angular2/src/compiler/util';
-import {IS_DART} from 'angular2/src/facade/lang';
 import {PLATFORM_DIRECTIVES} from 'angular2/src/core/platform_directives_and_pipes';
 import {MalformedStylesComponent} from './runtime_metadata_fixture';
 
diff --git a/modules/angular2/test/compiler/selector_spec.ts b/modules/angular2/test/compiler/selector_spec.ts
index 45204d09c0..b35ffc7e76 100644
--- a/modules/angular2/test/compiler/selector_spec.ts
+++ b/modules/angular2/test/compiler/selector_spec.ts
@@ -1,7 +1,6 @@
 import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/testing_internal';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
-import {SelectorMatcher} from 'angular2/src/compiler/selector';
-import {CssSelector} from 'angular2/src/compiler/selector';
+import {SelectorMatcher, CssSelector} from 'angular2/src/compiler/selector';
 import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
 
 export function main() {
diff --git a/modules/angular2/test/core/linker/change_detection_integration_spec.ts b/modules/angular2/test/core/linker/change_detection_integration_spec.ts
index 20386313e9..b493a8bddd 100644
--- a/modules/angular2/test/core/linker/change_detection_integration_spec.ts
+++ b/modules/angular2/test/core/linker/change_detection_integration_spec.ts
@@ -16,7 +16,9 @@ import {
 } from 'angular2/testing_internal';
 
 import {
+  IS_DART,
   CONST_EXPR,
+  Type,
   isPresent,
   isBlank,
   isNumber,
@@ -37,7 +39,6 @@ import {
 
 import {OnDestroy} from 'angular2/src/core/metadata/lifecycle_hooks';
 
-import {IS_DART, Type} from 'angular2/src/facade/lang';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
 
 
diff --git a/modules/angular2/test/core/linker/integration_spec.ts b/modules/angular2/test/core/linker/integration_spec.ts
index bcbbe50ef2..0635c369d6 100644
--- a/modules/angular2/test/core/linker/integration_spec.ts
+++ b/modules/angular2/test/core/linker/integration_spec.ts
@@ -32,7 +32,8 @@ import {
   stringify,
   isBlank,
   CONST,
-  CONST_EXPR
+  CONST_EXPR,
+  IS_DART
 } from 'angular2/src/facade/lang';
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
 import {
@@ -58,9 +59,7 @@ import {
   ReflectiveInjector
 } from 'angular2/core';
 
-import {NgIf, NgFor} from 'angular2/common';
-
-import {AsyncPipe} from 'angular2/common';
+import {NgIf, NgFor, AsyncPipe} from 'angular2/common';
 
 import {
   PipeTransform,
@@ -93,7 +92,6 @@ import {ElementRef} from 'angular2/src/core/linker/element_ref';
 import {TemplateRef} from 'angular2/src/core/linker/template_ref';
 
 import {Renderer} from 'angular2/src/core/render';
-import {IS_DART} from 'angular2/src/facade/lang';
 
 const ANCHOR_ELEMENT = CONST_EXPR(new OpaqueToken('AnchorElement'));
 
diff --git a/modules/angular2/test/http/backends/jsonp_backend_spec.ts b/modules/angular2/test/http/backends/jsonp_backend_spec.ts
index 9a6b3ce4ee..3076806270 100644
--- a/modules/angular2/test/http/backends/jsonp_backend_spec.ts
+++ b/modules/angular2/test/http/backends/jsonp_backend_spec.ts
@@ -11,7 +11,7 @@ import {
   xit,
   SpyObject
 } from 'angular2/testing_internal';
-import {ObservableWrapper} from 'angular2/src/facade/async';
+import {ObservableWrapper, TimerWrapper} from 'angular2/src/facade/async';
 import {BrowserJsonp} from 'angular2/src/http/backends/browser_jsonp';
 import {
   JSONPConnection,
@@ -21,7 +21,6 @@ import {
 } from 'angular2/src/http/backends/jsonp_backend';
 import {provide, Injector, ReflectiveInjector} from 'angular2/core';
 import {isPresent, StringWrapper} from 'angular2/src/facade/lang';
-import {TimerWrapper} from 'angular2/src/facade/async';
 import {Request} from 'angular2/src/http/static_request';
 import {Response} from 'angular2/src/http/static_response';
 import {Map} from 'angular2/src/facade/collection';
diff --git a/modules/angular2/test/mock/view_resolver_mock_spec.ts b/modules/angular2/test/mock/view_resolver_mock_spec.ts
index 1102e31402..29d46852cf 100644
--- a/modules/angular2/test/mock/view_resolver_mock_spec.ts
+++ b/modules/angular2/test/mock/view_resolver_mock_spec.ts
@@ -8,14 +8,12 @@ import {
   it,
 } from 'angular2/testing_internal';
 
-import {stringify} from 'angular2/src/facade/lang';
+import {stringify, isBlank} from 'angular2/src/facade/lang';
 
 import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
 
 import {Component, ViewMetadata} from 'angular2/src/core/metadata';
 
-import {isBlank} from 'angular2/src/facade/lang';
-
 export function main() {
   describe('MockViewResolver', () => {
     var viewResolver: MockViewResolver;
diff --git a/modules/angular2/test/platform/browser/bootstrap_spec.ts b/modules/angular2/test/platform/browser/bootstrap_spec.ts
index 923625a2a7..fa7240e86f 100644
--- a/modules/angular2/test/platform/browser/bootstrap_spec.ts
+++ b/modules/angular2/test/platform/browser/bootstrap_spec.ts
@@ -14,7 +14,7 @@ import {
 } from 'angular2/testing_internal';
 import {IS_DART, isPresent, stringify} from 'angular2/src/facade/lang';
 import {bootstrap, BROWSER_PROVIDERS, BROWSER_APP_PROVIDERS} from 'angular2/platform/browser';
-import {ApplicationRef, PlatformRef} from 'angular2/src/core/application_ref';
+import {ApplicationRef, PlatformRef, disposePlatform} from 'angular2/src/core/application_ref';
 import {Console} from 'angular2/src/core/console';
 import {Component, Directive, OnDestroy} from 'angular2/core';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
@@ -30,7 +30,6 @@ import {
   createPlatform,
   ReflectiveInjector
 } from 'angular2/core';
-import {disposePlatform} from 'angular2/src/core/application_ref';
 import {ExceptionHandler, BaseException} from 'angular2/src/facade/exceptions';
 import {Testability, TestabilityRegistry} from 'angular2/src/core/testability/testability';
 import {ComponentRef} from "angular2/src/core/linker/component_factory";
diff --git a/modules/angular2/test/testing/testing_public_browser_spec.ts b/modules/angular2/test/testing/testing_public_browser_spec.ts
index 56026cd26a..a772bed4ad 100644
--- a/modules/angular2/test/testing/testing_public_browser_spec.ts
+++ b/modules/angular2/test/testing/testing_public_browser_spec.ts
@@ -15,8 +15,7 @@ import {
   tick
 } from 'angular2/testing';
 
-import {Injectable, bind} from 'angular2/core';
-import {Directive, Component, ViewMetadata} from 'angular2/core';
+import {Injectable, bind, Directive, Component, ViewMetadata} from 'angular2/core';
 import {PromiseWrapper} from 'angular2/src/facade/promise';
 import {XHR} from 'angular2/src/compiler/xhr';
 import {XHRImpl} from 'angular2/src/platform/browser/xhr_impl';
diff --git a/modules/angular2/test/testing/testing_public_spec.ts b/modules/angular2/test/testing/testing_public_spec.ts
index bcdc4c77b8..c7848c7a35 100644
--- a/modules/angular2/test/testing/testing_public_spec.ts
+++ b/modules/angular2/test/testing/testing_public_spec.ts
@@ -16,9 +16,8 @@ import {
   TestComponentBuilder
 } from 'angular2/testing';
 
-import {Injectable, bind} from 'angular2/core';
+import {Injectable, bind, Directive, Component, ViewMetadata} from 'angular2/core';
 import {NgIf} from 'angular2/common';
-import {Directive, Component, ViewMetadata} from 'angular2/core';
 import {PromiseWrapper} from 'angular2/src/facade/promise';
 
 // Services, and components for the tests.
diff --git a/modules/benchmarks/src/compiler/selector_benchmark.ts b/modules/benchmarks/src/compiler/selector_benchmark.ts
index 3ff9ec546a..2c30ea4207 100644
--- a/modules/benchmarks/src/compiler/selector_benchmark.ts
+++ b/modules/benchmarks/src/compiler/selector_benchmark.ts
@@ -1,5 +1,4 @@
-import {SelectorMatcher} from "angular2/src/compiler/selector";
-import {CssSelector} from "angular2/src/compiler/selector";
+import {SelectorMatcher, CssSelector} from "angular2/src/compiler/selector";
 import {StringWrapper, Math} from 'angular2/src/facade/lang';
 import {getIntParameter, bindAction} from 'angular2/src/testing/benchmark_util';
 import {BrowserDomAdapter} from 'angular2/src/platform/browser/browser_adapter';