Replaced __defineGetter__ and __defineSetter__ with Object.defineProperty
Fix formatting