#3 cleaned code

Author: insanoid

SwiftyJSONAccelerator/Base.lproj/Main.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="15A282b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="15A284" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9059"/>
@@ -699,10 +699,10 @@
                                             <animations/>
                                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                                            <size key="minSize" width="700" height="461"/>
+                                            <size key="minSize" width="715" height="461"/>
                                             <size key="maxSize" width="717" height="10000000"/>
                                             <color key="insertionPointColor" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
-                                            <size key="minSize" width="700" height="461"/>
+                                            <size key="minSize" width="715" height="461"/>
                                             <size key="maxSize" width="717" height="10000000"/>
                                         </textView>
                                     </subviews>
@@ -716,7 +716,7 @@
                                     <animations/>
                                 </scroller>
                                 <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="9fh-RH-upi">
-                                    <rect key="frame" x="701" y="1" width="15" height="461"/>
+                                    <rect key="frame" x="700" y="1" width="16" height="461"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <animations/>
                                 </scroller>

SwiftyJSONAccelerator/SJEditorViewController.swift

@@ -49,12 +49,12 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
     }
 
     /**
-    Validates and updates the textview.
+     Validates and updates the textview.
 
-    - parameter pretty: If the JSON is to be pretty printed.
+     - parameter pretty: If the JSON is to be pretty printed.
 
-    - returns: if the format was valid.
-    */
+     - returns: if the format was valid.
+     */
     func validateAndFormat(pretty: Bool) -> Bool {
 
         if textView?.string?.characters.count == 0 {
@@ -80,8 +80,8 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
     }
 
     /**
-    Actual function that generates the model.
-    */
+     Actual function that generates the model.
+     */
     func generateModel() {
 
         // The base class field is blank, cannot proceed without it. Possibly can have a default value in the future.
@@ -106,9 +106,9 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
 
             let swiftyState = self.includeSwiftyCheckbox?.state == 1 ? true : false
             let supportSwiftyState = self.supportSwiftyJSONCheckbox?.state == 1 ? true : false
-            
+
             let nscodingState = self.supportNSCodingCheckbox?.state == 1 ? true : false
-            
+
             let objectMapperState = self.includeObjectMapperCheckbox?.state == 1 ? true : false
             let supportObjectMapperState = self.supportObjectMapperCheckbox?.state == 1 ? true : false
 
@@ -122,7 +122,7 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
     }
 
     @IBAction func recalcEnabledBoxes(sender: AnyObject) {
-        
+
         let supportSwiftyState = self.supportSwiftyJSONCheckbox?.state == 1 ? true : false
         let supportObjectMapperState = self.supportObjectMapperCheckbox?.state == 1 ? true : false
 
@@ -132,15 +132,15 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
         else {
             self.includeSwiftyCheckbox?.enabled = false
         }
-        
+
         if supportObjectMapperState {
             self.includeObjectMapperCheckbox?.enabled = true
         }
         else {
             self.includeObjectMapperCheckbox?.enabled = false
         }
     }
-    
+
     // MARK: Internal Methods
 
     /**
@@ -177,11 +177,11 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
     }
 
     /**
-    Handle Error message that is provided by the JSON helper and extract the message and showing them accordingly.
+     Handle Error message that is provided by the JSON helper and extract the message and showing them accordingly.
 
-    - parameters:
-    - error: NSError that was provided.
-    */
+     - parameters:
+     - error: NSError that was provided.
+     */
     func handleError(error: NSError?) {
         if let _ = error!.userInfo["debugDescription"] as? String? {
             let message: String = error!.userInfo["NSDebugDescription"]! as! String
@@ -214,19 +214,19 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
     }
 
     /**
-    Show that the JSON is fine with proper icon.
-    */
+     Show that the JSON is fine with proper icon.
+     */
     func correctJSONMessage() {
         errorImageView?.image = NSImage.init(named: "success")
         messageLabel?.stringValue = "Valid JSON!"
     }
 
     /**
-    Show the invalid JSON error with proper error and message.
+     Show the invalid JSON error with proper error and message.
 
-    - parameters:
-    - message: Error message that is to be shown.
-    */
+     - parameters:
+     - message: Error message that is to be shown.
+     */
     func invalidJSONError(message: String) {
         errorImageView?.image = NSImage.init(named: "failure")
         messageLabel?.stringValue = message