A bit of style changes

lib/associations/belongs-to.js

@@ -88,15 +88,9 @@ module.exports = (function() {
     var association = this
     var association = this
 
 
     instancePrototype[this.accessors.set] = function(associatedInstance, options) {
     instancePrototype[this.accessors.set] = function(associatedInstance, options) {
-      var value
-      if (associatedInstance) {
-        if (associatedInstance instanceof association.target.Instance) {
-          value = associatedInstance[association.targetIdentifier]
-        } else {
-          value = associatedInstance
-        }
-      } else {
-        value = null
+      var value = associatedInstance
+      if (associatedInstance instanceof association.target.Instance) {
+        value = associatedInstance[association.targetIdentifier]
       }
       }
       
       
       this.set(association.identifier, value)
       this.set(association.identifier, value)

lib/associations/has-many.js

@@ -265,18 +265,18 @@ module.exports = (function() {
       return new Class(association, this).injectGetter(options, queryOptions)
       return new Class(association, this).injectGetter(options, queryOptions)
     }
     }
 
 
-    obj[this.accessors.hasAll] = function(objects, options) {
+    obj[this.accessors.hasAll] = function(instances, options) {
       var instance = this
       var instance = this
         , where
         , where
 
 
       options = options || {}
       options = options || {}
       
       
-      objects.forEach(function (o) {
-        if (o instanceof association.target.Instance) {
-          where = new Utils.or([where, o.primaryKeyValues])
+      instances.forEach(function (instance) {
+        if (instance instanceof association.target.Instance) {
+          where = new Utils.or([where, instance.primaryKeyValues])
         } else {
         } else {
           var _where = {}
           var _where = {}
-          _where[association.target.primaryKeyAttribute] = o
+          _where[association.target.primaryKeyAttribute] = instance
           where = new Utils.or([where, _where])
           where = new Utils.or([where, _where])
         }
         }
       })
       })
@@ -290,21 +290,21 @@ module.exports = (function() {
         options,
         options,
         { raw: true }
         { raw: true }
       ).then(function(associatedObjects) {
       ).then(function(associatedObjects) {
-        return associatedObjects.length === objects.length
+        return associatedObjects.length === instances.length
       })
       })
     }
     }
 
 
-    obj[this.accessors.hasSingle] = function(o, options) {
+    obj[this.accessors.hasSingle] = function(param, options) {
       var instance = this
       var instance = this
         , where
         , where
 
 
       options = options || {}
       options = options || {}
 
 
-      if (o instanceof association.target.Instance) {
-        where = o.primaryKeyValues
+      if (param instanceof association.target.Instance) {
+        where = param.primaryKeyValues
       } else {
       } else {
         where = {}
         where = {}
-        where[association.target.primaryKeyAttribute] = o
+        where[association.target.primaryKeyAttribute] = param
       }
       }
 
 
       options.where = new Utils.and([
       options.where = new Utils.and([