diff --git a/src/AndGate.cpp b/src/AndGate.cpp
index af530d3..59ca186 100644
--- a/src/AndGate.cpp
+++ b/src/AndGate.cpp
@@ -2,9 +2,7 @@
 
 using namespace std;
 
-AndGate::AndGate(priority_queue<event> *eQueue, int d, wire* wire1, wire* wire2,
-  wire* wire3) {
-	e = eQueue;
+AndGate::AndGate(int d, Wire* wire1, Wire* wire2, Wire* wire3) {
 	delay = d;
 	in1 = wire1;
 	in2 = wire2;
@@ -13,13 +11,13 @@ AndGate::AndGate(priority_queue<event> *eQueue, int d, wire* wire1, wire* wire2,
 int AndGate::evaluate(int evTime) {
 	if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) {
 		if (out->getValue(evTime + delay) != 0) {
-			e->push(event(e->size, 0, evTime + delay, out));
+			e->push(Event(e->size, 0, evTime + delay, out));
 			out->setValue(0, evTime + delay);
 		}
 	}
 	else if(in1->getValue(evTime) == 1 && in2->getValue(evTime) == 1){
 		if (out->getValue(evTime + delay) != 1) {
-			e->push(event(e->size, 1, evTime + delay, out));
+			e->push(Event(e->size, 1, evTime + delay, out));
 			out->setValue(1, evTime + delay);
 		}
 	}
diff --git a/src/NandGate.cpp b/src/NandGate.cpp
index 9c449a2..f38c46a 100644
--- a/src/NandGate.cpp
+++ b/src/NandGate.cpp
@@ -12,13 +12,13 @@ void NandGate::evaluate(int evTime)
 {
 	if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) {
 		if (out->getValue(evTime + delay) != 1) {
-			e->push(event(e->size, 1, evTime + delay, out));
+			e->push(Event(e->size, 1, evTime + delay, out));
 			out->setValue(1, evTime + delay);
 		}
 	}
 	else {
 		if (out->getValue(evTime + delay) != 0) {
-			e->push(event(e->size, 0, evTime + delay, out));
+			e->push(Event(e->size, 0, evTime + delay, out));
 			out->setValue(0, evTime + delay);
 		}
 	}
diff --git a/src/NorGate.cpp b/src/NorGate.cpp
index 77bc51d..175aeaa 100644
--- a/src/NorGate.cpp
+++ b/src/NorGate.cpp
@@ -3,7 +3,6 @@
 using namespace std;
 
 NorGate::NorGate(int d, Wire* wire1, Wire* wire2, Wire* wire3) {
-	e = eQueue;
 	delay = d;
 	in1 = wire1;
 	in2 = wire2;
@@ -13,13 +12,13 @@ NorGate::NorGate(int d, Wire* wire1, Wire* wire2, Wire* wire3) {
 void NorGate::evaluate(int evTime) {
 	if (in1->getValue(evTime) == 1 || in2->getValue(evTime) == 1) {
 		if (out->getValue(evTime + delay) != 0) {
-			e->push(event(e->size, 0, evTime + delay, out));
+			e->push(Event(e->size, 0, evTime + delay, out));
 			out->setValue(0, evTime + delay);
 		}
 	}
 	else if (in1->getValue(evTime) == 0 && in2->getValue(evTime) == 0) {
 		if (out->getValue(evTime + delay) != 1) {
-			e->push(event(e->size, 1, evTime + delay, out));
+			e->push(Event(e->size, 1, evTime + delay, out));
 			out->setValue(1, evTime + delay);
 		}
 	}
diff --git a/src/NotGate.cpp b/src/NotGate.cpp
index 6a97658..62c372b 100644
--- a/src/NotGate.cpp
+++ b/src/NotGate.cpp
@@ -6,19 +6,18 @@ NotGate::NotGate(int d, Wire* wire1, Wire* wire2) {
 	delay = d;
 	in1 = wire1;
 	out = wire2;
-	
 }
 
 void NotGate::evaluate(int evTime) {
 	if (in1->getValue(evTime) == 0) {
 		if (out->getValue(evTime + delay) != 0) {
-			e->push(event(e->size, 0, evTime + delay, out));
+			e->push(Event(e->size, 0, evTime + delay, out));
 			out->setValue(0, evTime + delay);
 		}
 	}
 	else{
 		if (out->getValue(evTime + delay) != 1) {
-			e->push(event(e->size, 1, evTime + delay, out));
+			e->push(Event(e->size, 1, evTime + delay, out));
 			out->setValue(1, evTime + delay);
 		}
 	}