 
 		// set the form to be able to handle file uploads
 		if (!StructKeyExists(arguments, "enctype") && arguments.multipart)
+		{
 			arguments.enctype = "multipart/form-data";
+		}
 
 		loc.skip = "multipart,spamProtection,route,controller,key,params,anchor,onlyPath,host,protocol,port";
+
+		// variables passed in as route arguments should not be added to the html element
 		if (Len(arguments.route))
-			loc.skip = ListAppend(loc.skip, $routeVariables(argumentCollection=arguments)); // variables passed in as route arguments should not be added to the html element
+		{
+			loc.skip = ListAppend(loc.skip, $routeVariables(argumentCollection=arguments));
+		}
+		
+		// need to re-add action here even if it was removed due to being a route variable above
 		if (ListFind(loc.skip, "action"))
-			loc.skip = ListDeleteAt(loc.skip, ListFind(loc.skip, "action")); // need to re-add action here even if it was removed due to being a route variable above
+		{
+			loc.skip = ListDeleteAt(loc.skip, ListFind(loc.skip, "action"));
+		}
 
 		loc.returnValue = $tag(name="form", skip=loc.skip, attributes=arguments);
 	</cfscript>

	<cfargument name="property" type="string" required="true">
	<cfargument name="label" type="string" required="true">
	<cfscript>
		var object = false;
		if (Compare("false", arguments.label) == 0)
			return "";
		if (arguments.label == "useDefaultLabel" && !IsStruct(arguments.objectName))
		{
			object = $getObject(arguments.objectName);
			if (IsObject(object))
				return object.$label(arguments.property);
		}
	</cfscript>
	<cfreturn arguments.label />
</cffunction>
	<cfargument name="errorElement" type="string" required="true">
	<cfargument name="errorClass" type="string" required="true">
	<cfscript>
		var loc = {};
		loc.returnValue = "";
		arguments.label = $getFieldLabel(argumentCollection=arguments);
		if ($formHasError(argumentCollection=arguments) && Len(arguments.errorElement))
		{
			// the input has an error and should be wrapped in a tag so we need to start that wrapper tag
			loc.returnValue &= $tag(name=arguments.errorElement, class=arguments.errorClass);
		}
		if (Len(arguments.label) && arguments.labelPlacement != "after")
		{
			loc.returnValue &= $createLabel(argumentCollection=arguments);
			if (arguments.labelPlacement == "aroundRight")
			{
				// strip out both the label text and closing label tag since it will be placed after the form input
				loc.returnValue = Replace(loc.returnValue, arguments.label & "</label>", "");
			}
			else if (arguments.labelPlacement == "before")
			{
				// since the entire label is created we can append to it
				loc.returnValue &= arguments.appendToLabel;
			}
			else
			{
				// the label argument is either "around" or "aroundLeft" so we only have to strip out the closing label tag
				loc.returnValue = Replace(loc.returnValue, "</label>", "");
			}
		}
		loc.returnValue &= arguments.prepend;
	</cfscript>
	<cfreturn loc.returnValue>
</cffunction>

<cffunction name="$formAfterElement" returntype="string" access="public" output="false">
