diff --git a/tpl/macro.twig b/tpl/macro.twig
index 576cfcc..6f80d37 100644
--- a/tpl/macro.twig
+++ b/tpl/macro.twig
@@ -352,6 +352,7 @@
       for(int i=0;i<dvl.Count;++i) 
       { 
         var tdv = dvl[i]; 
+        {#TODO: get rid of replace hack below#}
         {{('var ' ~ _self.val2native(type.value, 'tdv', 'tmp'))|replace({'tmp = tmp' : '', 'var var' : 'var'})}};
         {{native}}.Add(tmp); 
       }
@@ -549,7 +550,8 @@
     delegate(VM.Frame frm, Val ctx, ref Val v, FieldSymbol fld) {
     #if !BHL_FRONT
       {%~ if has_token(o, 'bhl_custom_rw') ~%}
-      {{class}} f = new {{class}}(); ctx.Decode(ref f);
+      {{class}} f = new {{class}}(); 
+      ctx.Decode(ref f);
       {%- else ~%}
       var f = ({{class}})ctx.obj;
       {%- endif ~%}
@@ -572,7 +574,8 @@
     delegate(VM.Frame frm, ref Val ctx, Val v, FieldSymbol fld) {
     #if !BHL_FRONT
       {%~ if has_token(o, 'bhl_custom_rw') ~%}
-      {{class}} f = new {{class}}(); ctx.Decode(ref f);
+      {{class}} f = new {{class}}(); 
+      ctx.Decode(ref f);
       {%- else ~%}
       var f = ({{class}})ctx.obj;
       {%- endif ~%}
@@ -740,9 +743,8 @@
        Val dv = null;
 
   {%- if token_or(f, 'bhl_set', 1) != 0 ~%}
-       if(args_info.CountArgs() > 1) {
+       if(args_info.CountArgs() > 1)
          dv = stack.Pop();
-       }
   {%- endif ~%}
 
        EcsEntity e = default;