diff --git a/action_plugins/qubesformation.py b/action_plugins/qubesformation.py
index 3b241ae..7be54e8 100644
--- a/action_plugins/qubesformation.py
+++ b/action_plugins/qubesformation.py
@@ -8,30 +8,21 @@ from ansible.plugins.action.template import ActionModule as template
 sys.path.insert(0, os.path.dirname(__file__))
 import commonlib
 
-
 contents = """{{ vms | to_nice_yaml }}"""
 topcontents = "{{ saltenv }}:\n  '*':\n  - {{ recipename }}\n"
 
-
 def generate_datastructure(vms, task_vars):
     dc = collections.OrderedDict
     d = dc()
     for n, data in vms.items():
-        print(n)
         # This block will skip any VMs that are not in the groups defined in the 'formation_vm_groups' variable
         # This allows you to deploy in multiple stages which is useful in cases
         # where you want to create a template after another template is already provisioned.
-        print("hostvars")
-        print(task_vars['hostvars'][n])
-        print("testy")
-        print(task_vars['hostvars'][n]['formation_vm_groups'])
-        if hasattr(task_vars.ansible_facts, 'formation_vm_groups'):
-            continueLoop = true
-            for group in task_vars.ansible_facts['formation_vm_groups']:
-                print("group vars")
-                print(task_vars.ansible_facts.groups[group])
-                if n in task_vars.ansible_facts.groups[group]:
-                    continueLoop = false
+        if 'formation_vm_groups' in task_vars:
+            continueLoop = True
+            for group in task_vars['formation_vm_groups']:
+                if n in task_vars['hostvars'][n]['groups'][group]:
+                    continueLoop = False
             if continueLoop:
                 continue
         
@@ -108,7 +99,6 @@ def generate_datastructure(vms, task_vars):
 
     return d
 
-
 class ActionModule(template):
 
     TRANSFERS_FILES = True