diff --git a/ReactiveAppKit.xcodeproj/project.pbxproj b/ReactiveAppKit.xcodeproj/project.pbxproj
index 571832c..6a15a3f 100644
--- a/ReactiveAppKit.xcodeproj/project.pbxproj
+++ b/ReactiveAppKit.xcodeproj/project.pbxproj
@@ -55,7 +55,9 @@
 				EC9C39E61CF5A5910090F133 /* ReactiveAppKit */,
 				EC9C39E51CF5A5910090F133 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		EC9C39E51CF5A5910090F133 /* Products */ = {
 			isa = PBXGroup;
diff --git a/ReactiveAppKit/ReactiveAppKit.h b/ReactiveAppKit/ReactiveAppKit.h
index 1c38406..2bc4cf1 100644
--- a/ReactiveAppKit/ReactiveAppKit.h
+++ b/ReactiveAppKit/ReactiveAppKit.h
@@ -1,10 +1,6 @@
 //
-//  ReactiveAppKit.h
-//  ReactiveAppKit
-//
 //  Created by Srdan Rasic on 25/05/16.
 //  Copyright © 2016 ReactiveKit. All rights reserved.
-//
 
 #import <Cocoa/Cocoa.h>
 
@@ -13,7 +9,3 @@ FOUNDATION_EXPORT double ReactiveAppKitVersionNumber;
 
 //! Project version string for ReactiveAppKit.
 FOUNDATION_EXPORT const unsigned char ReactiveAppKitVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ReactiveAppKit/PublicHeader.h>
-
-
diff --git a/Sources/NSButton.swift b/Sources/NSButton.swift
index de89a8e..af6b411 100755
--- a/Sources/NSButton.swift
+++ b/Sources/NSButton.swift
@@ -42,4 +42,5 @@ extension NSButton {
   public var rState: Property<Int> {
     return rAssociatedPropertyForValueForKey("state")
   }
+  
 }
diff --git a/Sources/NSControl.swift b/Sources/NSControl.swift
index 45f35a7..65c09b8 100755
--- a/Sources/NSControl.swift
+++ b/Sources/NSControl.swift
@@ -25,8 +25,8 @@
 import ReactiveKit
 import Cocoa
 
-@objc class RKNSControlHelper: NSObject
-{
+@objc class RKNSControlHelper: NSObject {
+
   weak var control: NSControl?
   let pushStream = PushStream<AnyObject?>()
   
@@ -47,6 +47,7 @@ import Cocoa
     control?.action = nil
     pushStream.completed()
   }
+
 }
 
 extension NSControl {
@@ -92,4 +93,5 @@ extension NSControl {
   public var rDoubleValue: Property<Double> {
     return rAssociatedPropertyForValueForKey("doubleValue")
   }
+  
 }
diff --git a/Sources/NSImageView.swift b/Sources/NSImageView.swift
index 844845e..4b1072c 100755
--- a/Sources/NSImageView.swift
+++ b/Sources/NSImageView.swift
@@ -30,6 +30,7 @@ extension NSImageView {
   public var rImage: Property<NSImage?> {
     return rAssociatedPropertyForValueForKey("image")
   }
+  
 }
 
 extension NSImageView: BindableType {
@@ -37,4 +38,5 @@ extension NSImageView: BindableType {
   public func observer(disconnectDisposable: Disposable) -> (StreamEvent<NSImage?> -> ()) {
     return self.rImage.observer(disconnectDisposable)
   }
+
 }
diff --git a/Sources/NSProgressIndicator.swift b/Sources/NSProgressIndicator.swift
index a4bae31..877ea9f 100755
--- a/Sources/NSProgressIndicator.swift
+++ b/Sources/NSProgressIndicator.swift
@@ -30,6 +30,7 @@ extension NSProgressIndicator {
   public var rProgress: Property<Float> {
     return rAssociatedPropertyForValueForKey("progress")
   }
+
 }
 
 extension NSProgressIndicator: BindableType {
@@ -37,4 +38,5 @@ extension NSProgressIndicator: BindableType {
   public func observer(disconnectDisposable: Disposable) -> (StreamEvent<Float> -> ()) {
     return self.rProgress.observer(disconnectDisposable)
   }
+
 }
diff --git a/Sources/NSSegmentedControl.swift b/Sources/NSSegmentedControl.swift
index 103c672..00475f9 100755
--- a/Sources/NSSegmentedControl.swift
+++ b/Sources/NSSegmentedControl.swift
@@ -22,7 +22,6 @@
 //  THE SOFTWARE.
 //
 
-
 import ReactiveKit
 import Cocoa
 
@@ -35,6 +34,7 @@ extension NSSegmentedControl {
   public var rSelectedSegment: Property<Int> {
     return rAssociatedPropertyForValueForKey("selectedSegment")
   }
+  
 }
 
 extension NSSegmentedControl {
@@ -42,4 +42,5 @@ extension NSSegmentedControl {
   public func observer(disconnectDisposable: Disposable) -> (StreamEvent<Int> -> ()) {
     return self.rSelectedSegment.observer(disconnectDisposable)
   }
+
 }
diff --git a/Sources/NSSlider.swift b/Sources/NSSlider.swift
index 36c0dfe..dd14fa8 100755
--- a/Sources/NSSlider.swift
+++ b/Sources/NSSlider.swift
@@ -50,4 +50,5 @@ extension NSSlider {
   public func observer(disconnectDisposable: Disposable) -> (StreamEvent<Double> -> ()) {
     return self.rDoubleValue.observer(disconnectDisposable)
   }
+  
 }
diff --git a/Sources/NSTextField.swift b/Sources/NSTextField.swift
index 5c38656..e78f0d8 100755
--- a/Sources/NSTextField.swift
+++ b/Sources/NSTextField.swift
@@ -22,12 +22,11 @@
 //  THE SOFTWARE.
 //
 
-
 import ReactiveKit
 import Cocoa
 
 extension NSTextField {
-  
+
   public var rFont: Property<NSFont?> {
     return rAssociatedPropertyForValueForKey("font")
   }
@@ -55,4 +54,5 @@ extension NSTextField {
   public func observer(disconnectDisposable: Disposable) -> (StreamEvent<String> -> ()) {
     return self.rStringleValue.observer(disconnectDisposable)
   }
+  
 }
diff --git a/Sources/NSView.swift b/Sources/NSView.swift
index 34d68b0..81c8152 100755
--- a/Sources/NSView.swift
+++ b/Sources/NSView.swift
@@ -34,4 +34,5 @@ extension NSView {
   public var rHidden: Property<Bool> {
     return rAssociatedPropertyForValueForKey("hidden")
   }
+  
 }