diff --git a/src/demo-app/style/style-demo.ts b/src/demo-app/style/style-demo.ts
index e1151da131f8..6d4db2808233 100644
--- a/src/demo-app/style/style-demo.ts
+++ b/src/demo-app/style/style-demo.ts
@@ -1,4 +1,4 @@
-import {Component, Renderer} from '@angular/core';
+import {Component, Renderer2} from '@angular/core';
 import {FocusOriginMonitor} from '@angular/material';
 
 
@@ -9,5 +9,5 @@ import {FocusOriginMonitor} from '@angular/material';
   styleUrls: ['style-demo.css'],
 })
 export class StyleDemo {
-  constructor(public renderer: Renderer, public fom: FocusOriginMonitor) {}
+  constructor(public renderer: Renderer2, public fom: FocusOriginMonitor) {}
 }
diff --git a/src/lib/button-toggle/button-toggle.spec.ts b/src/lib/button-toggle/button-toggle.spec.ts
index 6813aea7b3e7..c4d276ef768b 100644
--- a/src/lib/button-toggle/button-toggle.spec.ts
+++ b/src/lib/button-toggle/button-toggle.spec.ts
@@ -259,28 +259,29 @@ describe('MdButtonToggle', () => {
       expect(groupInstance.selected.value).toBe(groupInstance.value);
     });
 
-    it('should have the correct FormControl state initially and after interaction', fakeAsync(() => {
-      expect(groupNgModel.valid).toBe(true);
-      expect(groupNgModel.pristine).toBe(true);
-      expect(groupNgModel.touched).toBe(false);
-
-      buttonToggleInstances[1].checked = true;
-      fixture.detectChanges();
-      tick();
-
-      expect(groupNgModel.valid).toBe(true);
-      expect(groupNgModel.pristine).toBe(false);
-      expect(groupNgModel.touched).toBe(false);
-
-      let nativeRadioLabel = buttonToggleDebugElements[2].query(By.css('label')).nativeElement;
-      nativeRadioLabel.click();
-      fixture.detectChanges();
-      tick();
-
-      expect(groupNgModel.valid).toBe(true);
-      expect(groupNgModel.pristine).toBe(false);
-      expect(groupNgModel.touched).toBe(true);
-    }));
+    it('should have the correct FormControl state initially and after interaction',
+      fakeAsync(() => {
+        expect(groupNgModel.valid).toBe(true);
+        expect(groupNgModel.pristine).toBe(true);
+        expect(groupNgModel.touched).toBe(false);
+
+        buttonToggleInstances[1].checked = true;
+        fixture.detectChanges();
+        tick();
+
+        expect(groupNgModel.valid).toBe(true);
+        expect(groupNgModel.pristine).toBe(false);
+        expect(groupNgModel.touched).toBe(false);
+
+        let nativeRadioLabel = buttonToggleDebugElements[2].query(By.css('label')).nativeElement;
+        nativeRadioLabel.click();
+        fixture.detectChanges();
+        tick();
+
+        expect(groupNgModel.valid).toBe(true);
+        expect(groupNgModel.pristine).toBe(false);
+        expect(groupNgModel.touched).toBe(true);
+      }));
 
     it('should update the ngModel value when selecting a button toggle', fakeAsync(() => {
       buttonToggleInstances[1].checked = true;
@@ -341,7 +342,8 @@ describe('MdButtonToggle', () => {
       let fixture = TestBed.createComponent(ButtonToggleGroupWithInitialValue);
       let testComponent = fixture.debugElement.componentInstance;
       let groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
-      let groupInstance: MdButtonToggleGroup = groupDebugElement.injector.get<MdButtonToggleGroup>(MdButtonToggleGroup);
+      let groupInstance: MdButtonToggleGroup = groupDebugElement.injector
+          .get<MdButtonToggleGroup>(MdButtonToggleGroup);
 
       fixture.detectChanges();
 
diff --git a/src/lib/core/style/focus-origin-monitor.ts b/src/lib/core/style/focus-origin-monitor.ts
index bbe7fe174ac6..ec1dfee8a1aa 100644
--- a/src/lib/core/style/focus-origin-monitor.ts
+++ b/src/lib/core/style/focus-origin-monitor.ts
@@ -63,7 +63,9 @@ export class FocusOriginMonitor {
    * @returns An observable that emits when the focus state of the element changes.
    *     When the element is blurred, null will be emitted.
    */
-  monitor(element: HTMLElement, renderer: Renderer2, checkChildren: boolean): Observable<FocusOrigin> {
+  monitor(element: HTMLElement, renderer: Renderer2, checkChildren: boolean):
+    Observable<FocusOrigin> {
+
     // Check if we're already monitoring this element.
     if (this._elementInfo.has(element)) {
       let info = this._elementInfo.get(element);
@@ -169,9 +171,9 @@ export class FocusOriginMonitor {
    */
   private _setClasses(element: HTMLElement, origin: FocusOrigin): void {
     let renderer = this._elementInfo.get(element).renderer;
-    let toggleClass = (_class: string, shouldSet: boolean) => {
-      shouldSet ? renderer.addClass(element, _class) : renderer.removeClass(element, _class);
-    }
+    let toggleClass = (className: string, shouldSet: boolean) => {
+      shouldSet ? renderer.addClass(element, className) : renderer.removeClass(element, className);
+    };
 
     toggleClass('cdk-focused', !!origin);
     toggleClass('cdk-touch-focused', origin === 'touch');