Minor changes and general cleanupo of extra lines, returns and debugging prints

core/execution/action/action.py

@@ -23,15 +23,15 @@ def buildAction (action, outputs):
             recursiveresponses.append(response)
             outputs, response = buildRuntimeAttr(action, outputs, resolved, response)
 
-        return outputs, recursiveresponses, match, filter
+        return outputs, recursiveresponses
 
     else:
         outputs, resolved, match, filter = buildPreRuntimeAttr(action, outputs)
 
         if match:
-            return outputs, resolved, match, filter
-
+            return outputs, resolved
+        
         response, outputs = executeRequest(action, outputs, resolved)    
         outputs, response = buildRuntimeAttr(action, outputs, resolved, response)
 
-    return outputs, response, match, filter
+    return outputs, response

core/execution/executioncontract.py

@@ -3,14 +3,16 @@ from core.execution.operation import buildOperation
 from core.runtime import manageFailure
 
 def executeContract(module, outputs):
-    #try:
+    
     if module.kind == "operation":
-        outputs = buildOperation(module, outputs)
+        outputs, responses = buildOperation(module, outputs)
+        
+        return outputs, responses
 
     elif module.kind == "action":
-        outputs = buildAction(module, outputs)
+        outputs, response = buildAction(module, outputs)
 
+        return outputs, response
+    
     #except Exception as error:
         #outputs = manageFailure(error, module)
-
-    return outputs

core/execution/operation/operation.py

@@ -11,12 +11,11 @@ def buildOperation(definition, outputs):
 
     for action in actions:
 
-
         if action == "recursiveset":
             outputs, responses = recursiveSet(definition, outputs, responses)
 
         else:
-            outputs, response, match, filter = buildAction(action, outputs)
+            outputs, response = buildAction(action, outputs)
 
             responses.append(response)