diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h
index 58009c9..7f81751 100644
--- a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h
+++ b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h
@@ -9,10 +9,10 @@
 #include "../CFGraph.h"
 #include "../IR.h"
 
-template <class DataType, class NodeType>
-class BackwardDataFlowAnalysis : public DataFlowAnalysis<DataType, NodeType> {
+template <class NodeType>
+class BackwardDataFlowAnalysis : public DataFlowAnalysis<NodeType> {
     std::vector<SAPFOR::BasicBlock*> reorderSequence(const std::vector<SAPFOR::BasicBlock*>& blocks,
-        const std::set<SAPFOR::BasicBlock*> back_edge_sources);
+                                                     const std::set<SAPFOR::BasicBlock*> back_edge_sources);
 public:
     void fit(const std::vector<SAPFOR::BasicBlock*>& blocks);
 };
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow_impl.h b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow_impl.h
index d1d4486..4578e7b 100644
--- a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow_impl.h
+++ b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow_impl.h
@@ -13,10 +13,10 @@
 /* Note: this file should be included in backward_data_flow.h to provide template definitions */
 
 // minimizes the number of blocks beween the ends of back edges
-template <class DataType, class NodeType>
+template <class NodeType>
 std::vector<SAPFOR::BasicBlock*>
-BackwardDataFlowAnalysis<DataType, NodeType>::reorderSequence(const std::vector<SAPFOR::BasicBlock*>& blocks,
-                                                              const std::set<SAPFOR::BasicBlock*> back_edge_sources)
+BackwardDataFlowAnalysis<NodeType>::reorderSequence(const std::vector<SAPFOR::BasicBlock*>& blocks,
+                                                    const std::set<SAPFOR::BasicBlock*> back_edge_sources)
 {
     std::vector<SAPFOR::BasicBlock*> res = { };
 
@@ -40,8 +40,8 @@ BackwardDataFlowAnalysis<DataType, NodeType>::reorderSequence(const std::vector<
     return res;
 }
 
-template <class DataType, class NodeType>
-void BackwardDataFlowAnalysis<DataType, NodeType>::fit(const std::vector<SAPFOR::BasicBlock*>& blocks)
+template <class NodeType>
+void BackwardDataFlowAnalysis<NodeType>::fit(const std::vector<SAPFOR::BasicBlock*>& blocks)
 {
     std::set<std::pair<SAPFOR::BasicBlock*, SAPFOR::BasicBlock*>> back_edges = {};
 
@@ -65,21 +65,21 @@ void BackwardDataFlowAnalysis<DataType, NodeType>::fit(const std::vector<SAPFOR:
 
     std::reverse(blocks_sorted.begin(), blocks_sorted.end());
 
-    nodes.clear();
+    this->nodes.clear();
     std::map<SAPFOR::BasicBlock*, NodeType*> node_by_block;
 
     for (auto block : blocks_sorted)
     {
-        NodeType* node = createNode(block);
-        nodes.push_back(node);
+        NodeType* node = this->createNode(block);
+        this->nodes.push_back(node);
         node_by_block[block] = node;
     }
 
-    int nodes_size = nodes.size();
+    int nodes_size = this->nodes.size();
 
     for (int i = 0; i < nodes_size; i++)
     {
-        NodeType* node = nodes[i];
+        NodeType* node = this->nodes[i];
 
         auto back_edges_by_src_it = back_edges_by_src.find(node->getBlock());
         if (back_edges_by_src_it != back_edges_by_src.end())
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow.h b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow.h
index 11493a0..8067bd7 100644
--- a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow.h
+++ b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow.h
@@ -49,7 +49,7 @@ public:
     void setBlock(SAPFOR::BasicBlock* b) { bb = b; }
 };
 
-template <class DataType, class NodeType>
+template <class NodeType>
 class DataFlowAnalysis {
 protected:
     std::vector<NodeType*> nodes;
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h
index da5a5fb..5e74e29 100644
--- a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h
+++ b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h
@@ -67,8 +67,8 @@ void DataFlowAnalysisNode<DataType>::doStep()
 
 /* definitions for DataFlowAnalysis class */
 
-template <class DataType, class NodeType>
-void DataFlowAnalysis<DataType, NodeType>::analyze() {
+template <class NodeType>
+void DataFlowAnalysis<NodeType>::analyze() {
     auto curr = 0;
     auto stop = nodes.size();
 
@@ -103,10 +103,10 @@ void DataFlowAnalysis<DataType, NodeType>::analyze() {
     }
 }
     
-template <class DataType, class NodeType>
-DataFlowAnalysis<DataType, NodeType>::~DataFlowAnalysis()
+template <class NodeType>
+DataFlowAnalysis<NodeType>::~DataFlowAnalysis()
 {
-    for (DataFlowAnalysisNode<DataType>* node : nodes)
+    for (NodeType* node : nodes)
         delete node;
 
     nodes.clear();
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.cpp b/sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.cpp
index 48bdff8..51b4d14 100644
--- a/sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.cpp
@@ -271,7 +271,7 @@ public:
     }
 };
 
-class LiveVarAnalysis : public BackwardDataFlowAnalysis<map<SAPFOR::Argument*, vector<SAPFOR::BasicBlock*>>, LiveVarAnalysisNode> {
+class LiveVarAnalysis : public BackwardDataFlowAnalysis<LiveVarAnalysisNode> {
 protected:
     vector<SAPFOR::Argument*>& formal_parameters;
     vector<LiveDeadVarsForCall>& fcalls;
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp b/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp
index f1ad920..8cb4b18 100644
--- a/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp
@@ -298,7 +298,7 @@ public:
     const vector<bool>& getResult() { return useful; };
 };
 
-class DeadCodeAnalysis : public BackwardDataFlowAnalysis<map<SAPFOR::Argument*, vector<SAPFOR::BasicBlock*>>, DeadCodeAnalysisNode> {
+class DeadCodeAnalysis : public BackwardDataFlowAnalysis<DeadCodeAnalysisNode> {
 protected:
     vector<SAPFOR::Argument*>& formal_parameters;