diff --git a/src/Struct.js b/src/Struct.js
index e0e1caa5d62015a5fb67ab218ea86258419ed907..9a78519434af81e1d9659629a501723a4f645022 100644
--- a/src/Struct.js
+++ b/src/Struct.js
@@ -172,7 +172,7 @@ var Struct = {
         left.right = op.id
         yield* this.setOperation(left)
       } else {
-        op.right = op.parentSub ? (parent.map[op.parentSub] || null) : parent.start
+        op.right = op.parentSub ? parent.map[op.parentSub] || null : parent.start
       }
       // reconnect right
       if (op.right != null) {
diff --git a/src/y.js b/src/y.js
index fd311f5867852ef39b83521c338d18ff7725851e..2b72d3029a089dd446af4df8c1b949e192656660 100644
--- a/src/y.js
+++ b/src/y.js
@@ -1,41 +1,41 @@
 /* @flow */
 
 function Y (opts) {
-  var def = Promise.defer();
-  new YConfig(opts, function(yconfig){ //eslint-disable-line
-    yconfig.db.whenUserIdSet(function(){
-      def.resolve(yconfig);
-    });
-  });
-  return def.promise;
+  var def = Promise.defer()
+  new YConfig(opts, function (yconfig) { // eslint-disable-line
+    yconfig.db.whenUserIdSet(function () {
+      def.resolve(yconfig)
+    })
+  })
+  return def.promise
 }
 
-class YConfig { //eslint-disable-line no-unused-vars
+class YConfig { // eslint-disable-line no-unused-vars
   constructor (opts, callback) {
-    this.db = new Y[opts.db.name](this, opts.db);
-    this.connector = new Y[opts.connector.name](this, opts.connector);
-    var yconfig = this;
-    this.db.requestTransaction(function*(){
+    this.db = new Y[opts.db.name](this, opts.db)
+    this.connector = new Y[opts.connector.name](this, opts.connector)
+    var yconfig = this
+    this.db.requestTransaction(function *() {
       // create initial Map type
       var model = {
-        id: ["_", 0],
-        struct: "Map",
-        type: "Map",
+        id: ['_', 0],
+        struct: 'Map',
+        type: 'Map',
         map: {}
-      };
-      yield* this.addOperation(model);
-      var root = yield* this.createType(model);
-      this.store.y.root = root;
-      callback(yconfig);
-    });
+      }
+      yield* this.addOperation(model)
+      var root = yield* this.createType(model)
+      this.store.y.root = root
+      callback(yconfig)
+    })
   }
   destroy () {
-    this.connector.disconnect();
-    this.db.removeDatabase();
-    this.connector = null;
-    this.db = null;
-    this.transact = function(){
-      throw new Error("Remember?, you destroyed this type ;)");
-    };
+    this.connector.disconnect()
+    this.db.removeDatabase()
+    this.connector = null
+    this.db = null
+    this.transact = function () {
+      throw new Error('Remember?, you destroyed this type ;)')
+    }
   }
 }