diff --git a/lib/digital-pin.js b/lib/digital-pin.js
index 1897dee..dc98177 100644
--- a/lib/digital-pin.js
+++ b/lib/digital-pin.js
@@ -2,201 +2,186 @@
  * Linux IO DigitalPin
  * cylonjs.com
  *
- * Copyright (c) 2013 The Hybrid Group
+ * Copyright (c) 2013-2014 The Hybrid Group
  * Licensed under the Apache 2.0 license.
 */
 
+'use strict';
 
-(function() {
-  'use strict';
-  var EventEmitter, FS, namespace,
-    __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
+var FS = require('fs');
+var EventEmitter = require('events').EventEmitter;
+var namespace = require('node-namespace');
 
-  FS = require('fs');
+namespace("Cylon.IO", function() {
+  this.DigitalPin = (function(klass) {
+    subclass(DigitalPin, klass);
 
-  EventEmitter = require('events').EventEmitter;
+    var GPIO_PATH = "/sys/class/gpio";
+    var GPIO_READ = "in";
+    var GPIO_WRITE = "out";
+    var HIGH = 1;
+    var LOW = 0;
 
-  namespace = require('node-namespace');
+    function DigitalPin(opts) {
+      this.pinNum = opts.pin;
+      this.status = 'low';
+      this.ready = false;
+      this.mode = opts.mode;
+    }
 
-  namespace('Cylon.IO', function() {
-    return this.DigitalPin = (function(_super) {
-      var GPIO_PATH, GPIO_READ, GPIO_WRITE, HIGH, LOW;
-
-      __extends(DigitalPin, _super);
-
-      GPIO_PATH = "/sys/class/gpio";
-
-      GPIO_READ = "in";
-
-      GPIO_WRITE = "out";
-
-      HIGH = 1;
-
-      LOW = 0;
-
-      function DigitalPin(opts) {
-        this.pinNum = opts.pin;
-        this.status = 'low';
-        this.ready = false;
-        this.mode = opts.mode;
+    DigitalPin.prototype.connect = function(mode) {
+      var _this = this;
+      if (mode == null) {
+        mode = null;
       }
-
-      DigitalPin.prototype.connect = function(mode) {
-        var _this = this;
-        if (mode == null) {
-          mode = null;
-        }
-        if (this.mode == null) {
-          this.mode = mode;
-        }
-        return FS.exists(this._pinPath(), function(exists) {
-          if (exists) {
-            return _this._openPin();
-          } else {
-            return _this._createGPIOPin();
-          }
-        });
-      };
-
-      DigitalPin.prototype.close = function() {
-        var _this = this;
-        return FS.writeFile(this._unexportPath(), "" + this.pinNum, function(err) {
-          return _this._closeCallback(err);
-        });
-      };
-
-      DigitalPin.prototype.closeSync = function() {
-        FS.writeFileSync(this._unexportPath(), "" + this.pinNum);
-        return this._closeCallback(false);
-      };
-
-      DigitalPin.prototype.digitalWrite = function(value) {
-        var _this = this;
-        if (this.mode !== 'w') {
-          this._setMode('w');
-        }
-        this.status = value === 1 ? 'high' : 'low';
-        FS.writeFile(this._valuePath(), value, function(err) {
-          if (err) {
-            return _this.emit('error', "Error occurred while writing value " + value + " to pin " + _this.pinNum);
-          } else {
-            return _this.emit('digitalWrite', value);
-          }
-        });
-        return value;
-      };
-
-      DigitalPin.prototype.digitalRead = function(interval) {
-        var readData,
-          _this = this;
-        if (this.mode !== 'r') {
-          this._setMode('r');
-        }
-        readData = null;
-        return every(interval, function() {
-          return FS.readFile(_this._valuePath(), function(err, data) {
-            if (err) {
-              return _this.emit('error', "Error occurred while reading from pin " + _this.pinNum);
-            } else {
-              readData = parseInt(data.toString());
-              return _this.emit('digitalRead', readData);
-            }
-          });
-        });
-      };
-
-      DigitalPin.prototype.setHigh = function() {
-        return this.digitalWrite(1);
-      };
-
-      DigitalPin.prototype.setLow = function() {
-        return this.digitalWrite(0);
-      };
-
-      DigitalPin.prototype.toggle = function() {
-        if (this.status === 'low') {
-          return this.setHigh();
-        } else {
-          return this.setLow();
-        }
-      };
-
-      DigitalPin.prototype._createGPIOPin = function() {
-        var _this = this;
-        return FS.writeFile(this._exportPath(), "" + this.pinNum, function(err) {
-          if (err) {
-            return _this.emit('error', 'Error while creating pin files');
-          } else {
-            return _this._openPin();
-          }
-        });
-      };
-
-      DigitalPin.prototype._openPin = function() {
-        this._setMode(this.mode, true);
-        return this.emit('open');
-      };
-
-      DigitalPin.prototype._closeCallback = function(err) {
-        if (err) {
-          return this.emit('error', 'Error while closing pin files');
-        } else {
-          return this.emit('close', this.pinNum);
-        }
-      };
-
-      DigitalPin.prototype._setMode = function(mode, emitConnect) {
-        var _this = this;
-        if (emitConnect == null) {
-          emitConnect = false;
-        }
+      if (this.mode == null) {
         this.mode = mode;
-        if (mode === 'w') {
-          return FS.writeFile(this._directionPath(), GPIO_WRITE, function(err) {
-            return _this._setModeCallback(err, emitConnect);
-          });
-        } else if (mode === 'r') {
-          return FS.writeFile(this._directionPath(), GPIO_READ, function(err) {
-            return _this._setModeCallback(err, emitConnect);
-          });
-        }
-      };
-
-      DigitalPin.prototype._setModeCallback = function(err, emitConnect) {
-        if (err) {
-          return this.emit('error', "Setting up pin direction failed");
+      }
+      return FS.exists(this._pinPath(), function(exists) {
+        if (exists) {
+          return _this._openPin();
         } else {
-          this.ready = true;
-          if (emitConnect) {
-            return this.emit('connect', this.mode);
-          }
+          return _this._createGPIOPin();
         }
-      };
+      });
+    };
 
-      DigitalPin.prototype._directionPath = function() {
-        return "" + (this._pinPath()) + "/direction";
-      };
+    DigitalPin.prototype.close = function() {
+      var _this = this;
+      return FS.writeFile(this._unexportPath(), "" + this.pinNum, function(err) {
+        return _this._closeCallback(err);
+      });
+    };
 
-      DigitalPin.prototype._valuePath = function() {
-        return "" + (this._pinPath()) + "/value";
-      };
+    DigitalPin.prototype.closeSync = function() {
+      FS.writeFileSync(this._unexportPath(), "" + this.pinNum);
+      return this._closeCallback(false);
+    };
 
-      DigitalPin.prototype._pinPath = function() {
-        return "" + GPIO_PATH + "/gpio" + this.pinNum;
-      };
+    DigitalPin.prototype.digitalWrite = function(value) {
+      var _this = this;
+      if (this.mode !== 'w') {
+        this._setMode('w');
+      }
+      this.status = value === 1 ? 'high' : 'low';
+      FS.writeFile(this._valuePath(), value, function(err) {
+        if (err) {
+          return _this.emit('error', "Error occurred while writing value " + value + " to pin " + _this.pinNum);
+        } else {
+          return _this.emit('digitalWrite', value);
+        }
+      });
+      return value;
+    };
 
-      DigitalPin.prototype._exportPath = function() {
-        return "" + GPIO_PATH + "/export";
-      };
+    DigitalPin.prototype.digitalRead = function(interval) {
+      var readData,
+        _this = this;
+      if (this.mode !== 'r') {
+        this._setMode('r');
+      }
+      readData = null;
+      return every(interval, function() {
+        return FS.readFile(_this._valuePath(), function(err, data) {
+          if (err) {
+            return _this.emit('error', "Error occurred while reading from pin " + _this.pinNum);
+          } else {
+            readData = parseInt(data.toString());
+            return _this.emit('digitalRead', readData);
+          }
+        });
+      });
+    };
 
-      DigitalPin.prototype._unexportPath = function() {
-        return "" + GPIO_PATH + "/unexport";
-      };
+    DigitalPin.prototype.setHigh = function() {
+      return this.digitalWrite(1);
+    };
 
-      return DigitalPin;
+    DigitalPin.prototype.setLow = function() {
+      return this.digitalWrite(0);
+    };
 
-    })(EventEmitter);
-  });
+    DigitalPin.prototype.toggle = function() {
+      if (this.status === 'low') {
+        return this.setHigh();
+      } else {
+        return this.setLow();
+      }
+    };
 
-}).call(this);
+    DigitalPin.prototype._createGPIOPin = function() {
+      var _this = this;
+      return FS.writeFile(this._exportPath(), "" + this.pinNum, function(err) {
+        if (err) {
+          return _this.emit('error', 'Error while creating pin files');
+        } else {
+          return _this._openPin();
+        }
+      });
+    };
+
+    DigitalPin.prototype._openPin = function() {
+      this._setMode(this.mode, true);
+      return this.emit('open');
+    };
+
+    DigitalPin.prototype._closeCallback = function(err) {
+      if (err) {
+        return this.emit('error', 'Error while closing pin files');
+      } else {
+        return this.emit('close', this.pinNum);
+      }
+    };
+
+    DigitalPin.prototype._setMode = function(mode, emitConnect) {
+      var _this = this;
+      if (emitConnect == null) {
+        emitConnect = false;
+      }
+      this.mode = mode;
+      if (mode === 'w') {
+        return FS.writeFile(this._directionPath(), GPIO_WRITE, function(err) {
+          return _this._setModeCallback(err, emitConnect);
+        });
+      } else if (mode === 'r') {
+        return FS.writeFile(this._directionPath(), GPIO_READ, function(err) {
+          return _this._setModeCallback(err, emitConnect);
+        });
+      }
+    };
+
+    DigitalPin.prototype._setModeCallback = function(err, emitConnect) {
+      if (err) {
+        return this.emit('error', "Setting up pin direction failed");
+      } else {
+        this.ready = true;
+        if (emitConnect) {
+          return this.emit('connect', this.mode);
+        }
+      }
+    };
+
+    DigitalPin.prototype._directionPath = function() {
+      return "" + (this._pinPath()) + "/direction";
+    };
+
+    DigitalPin.prototype._valuePath = function() {
+      return "" + (this._pinPath()) + "/value";
+    };
+
+    DigitalPin.prototype._pinPath = function() {
+      return "" + GPIO_PATH + "/gpio" + this.pinNum;
+    };
+
+    DigitalPin.prototype._exportPath = function() {
+      return "" + GPIO_PATH + "/export";
+    };
+
+    DigitalPin.prototype._unexportPath = function() {
+      return "" + GPIO_PATH + "/unexport";
+    };
+
+    return DigitalPin;
+
+  })(EventEmitter);
+});