 			if (loc.association.nested.allow && loc.association.nested.autoSave && StructKeyExists(this, loc.item))
 			{
 				if (ListFindNoCase("belongsTo,hasOne", loc.association.type) && IsStruct(this[loc.item]))
+				{
 					$setOneToOneAssociationProperty(property=loc.item, value=this[loc.item], association=loc.association, delete=true);
+				}
 				else if (loc.association.type == "hasMany" && IsArray(this[loc.item]) && ArrayLen(this[loc.item]))
+				{
 					$setCollectionAssociationProperty(property=loc.item, value=this[loc.item], association=loc.association, delete=true);
-			}
-		}
-	</cfscript>
-	<cfreturn true />
+				}
+			}
+		}
+	</cfscript>
+	<cfreturn true>
 </cffunction>
 
 <cffunction name="$setOneToOneAssociationProperty" returntype="void" access="public" output="false">
-	<cfargument name="property" type="string" required="true" />
-	<cfargument name="value" type="struct" required="true" />
-	<cfargument name="association" type="struct" required="true" />
-	<cfargument name="delete" type="boolean" required="false" default="false" />
+	<cfargument name="property" type="string" required="true">
+	<cfargument name="value" type="struct" required="true">
+	<cfargument name="association" type="struct" required="true">
+	<cfargument name="delete" type="boolean" required="false" default="false">
 	<cfscript>
 		if (!StructKeyExists(this, arguments.property) || !IsObject(this[arguments.property]) || StructKeyExists(this[arguments.property], "_delete"))
+		{
 			this[arguments.property] = $getAssociationObject(argumentCollection=arguments);
-
+		}
 		if (IsObject(this[arguments.property]))
+		{
 			this[arguments.property].setProperties(properties=arguments.value);
+		}
 		else
-			StructDelete(this, arguments.property, false);
-	</cfscript>
-	<cfreturn />
+		{
+			StructDelete(this, arguments.property);
+		}
+	</cfscript>
+	<cfreturn>
 </cffunction>
 
 <cffunction name="$setCollectionAssociationProperty" returntype="void" access="public" output="false">
-	<cfargument name="property" type="string" required="true" />
-	<cfargument name="value" type="any" required="true" />
-	<cfargument name="association" type="struct" required="true" />
-	<cfargument name="delete" type="boolean" required="false" default="false" />
+	<cfargument name="property" type="string" required="true">
+	<cfargument name="value" type="any" required="true">
+	<cfargument name="association" type="struct" required="true">
+	<cfargument name="delete" type="boolean" required="false" default="false">
 	<cfscript>
 		var loc = {};
 		loc.model = model(arguments.association.modelName);
-
 		if (!StructKeyExists(this, arguments.property) || !IsArray(this[arguments.property]))
+		{
 			this[arguments.property] = [];
-
+		}
 		if (IsStruct(arguments.value))
 		{
 			for (loc.item in arguments.value)

						$updateCollectionObject(property=arguments.property, value=arguments.value[loc.i], position=loc.i);
					}
				}
				else if (IsStruct(arguments.value[loc.i]) && ArrayLen(this[arguments.property]) gte loc.i && IsObject(this[arguments.property][loc.i]))
				{
					this[arguments.property][loc.i] = $getAssociationObject(property=arguments.property, value=arguments.value[loc.i], association=arguments.association, delete=arguments.delete);
					if (!IsStruct(this[arguments.property][loc.i]) && !this[arguments.property][loc.i])

		}
		else if (IsArray(arguments.value))
		{
			for (loc.i=1; loc.i <= ArrayLen(arguments.value); loc.i++)
			{
				if (IsObject(arguments.value[loc.i]) && ArrayLen(this[arguments.property]) >= loc.i && IsObject(this[arguments.property][loc.i]) && this[arguments.property][loc.i].compareTo(arguments.value[loc.i]))
				{
					this[arguments.property][loc.i] = $getAssociationObject(property=arguments.property, value=arguments.value[loc.i], association=arguments.association, delete=arguments.delete);
					if (!IsStruct(this[arguments.property][loc.i]) && !this[arguments.property][loc.i])
