diff --git a/Parser.h b/Parser.h
index 08f37da..63ed38a 100755
--- a/Parser.h
+++ b/Parser.h
@@ -12,24 +12,10 @@ class PRelation
 	string name;
 	
 	public: 
-		PRelation()
-		{
-			name = "~";
-		}
-		
-		PRelation(string str)
-		{
-			name = str;
-		}
-		
-		void setPRelation(string str)
-		{
-			name = str;
-		}	
-		string getName()
-		{
-			return name;
-		}
+		PRelation() { name = "~"; }
+		PRelation(string str) { name = str; }
+		void setPRelation(string str) { name = str; }	
+		string getName() { return name; }
 };
 
 class PAttribute
@@ -40,69 +26,35 @@ class PAttribute
 	int size;
 	
 	public:
-		PAttribute()
-		{
+		PAttribute() {
 			name = "~";
 			type = "~";
 			key = false;
 			size = 0;
 		}
 		
-		PAttribute(string str, string t)
-		{
+		PAttribute(string str, string t) {
 			name = str;
 			type = t;
 			key = false;
 			size = 0;
 		}
 		
-		PAttribute(string str, string t, int s)
-		{
+		PAttribute(string str, string t, int s) {
 			name = str;
 			type = t;
 			key = false;
 			size = s;
 		}
 		
-		void setPAttributeName(string str)
-		{
-			name = str;
-		}
-		
-		void setPAttributeType(string t)
-		{
-			type = t;
-		}
-		
-		void setPAttributeKey()
-		{
-			key = true;
-		}
-		
-		void setPAttributeSize(int s)
-		{
-			size = s;
-		}
-		
-		string getPAttribute()
-		{
-			return name;
-		}
-		
-		string getPAttributeType()
-		{
-			return type;
-		}
-		
-		bool getPAttributeKey()
-		{
-			return key;
-		}
-		
-		int getPAttributeSize()
-		{
-			return size;
-		}
+		void setPAttributeName(string str) { name = str; }
+		void setPAttributeType(string t) { type = t; }
+		void setPAttributeKey() { key = true; }
+		void setPAttributeSize(int s) { size = s; }
+		string getPAttribute() { return name; }
+		string getPAttributeType() { return type; }
+		bool getPAttributeKey() { return key; }
+		int getPAttributeSize() { return size; }
 };
 
 class PUnion
@@ -111,20 +63,17 @@ class PUnion
 	string Un2;
 	
 	public:
-		PUnion()
-		{
+		PUnion() {
 			Un1 = "~";
 			Un2 = "~";
 		}
 		
-		PUnion (string s1, string s2)
-		{
+		PUnion(string s1, string s2) {
 			Un1 = s1;
 			Un2 = s2;
 		}
 		
-		string getPUnion()
-		{
+		string getPUnion() {
 			return "Union of " + Un1 + " and " + Un2;
 		}
 };
@@ -135,20 +84,17 @@ class PProduct
 	string Pr2;
 	
 	public:
-		PProduct()
-		{
+		PProduct() {
 			Pr1 = "~";
 			Pr2 = "~";
 		}
 		
-		PProduct(string s1, string s2)
-		{
+		PProduct(string s1, string s2) {
 			Pr1 = s1;
 			Pr2 = s2;
 		}
 		
-		string getPProduct()
-		{
+		string getPProduct() {
 			return "Product of " + Pr1 + " and " + Pr2;
 		}
 };
@@ -159,20 +105,17 @@ class PDifference
 	string D2;
 	
 	public:
-		PDifference()
-		{
+		PDifference() {
 			D1 = "~";
 			D2 = "~";
 		}
 		
-		PDifference(string s1, string s2)
-		{
+		PDifference(string s1, string s2) {
 			D1 = s1;
 			D2 = s2;
 		}
 		
-		string getPDifference()
-		{
+		string getPDifference() {
 			return "Difference of " + D1 + " and " + D2;
 		}
 };
@@ -183,20 +126,17 @@ class PRenaming
 	string oldName;
 	
 	public:
-		PRenaming()
-		{
+		PRenaming() {
 			newName = "~";
 			oldName = "~";
 		}
 		
-		PRenaming(string s1, string s2)
-		{
+		PRenaming(string s1, string s2) {
 			newName = s1;
 			oldName = s2;
 		}
 		
-		string doRename()
-		{
+		string doRename() {
 			return "Renaming " + oldName + " to " + newName;
 		}
 };
@@ -207,20 +147,17 @@ class PProjection
 	string oldName;
 	
 	public:
-		PProjection()
-		{
+		PProjection() {
 			newName = "~";
 			oldName = "~";
 		}
 		
-		PProjection(string s1, string s2)
-		{
+		PProjection(string s1, string s2) {
 			newName = s1;
 			oldName = s2;
 		}
 		
-		string doPProjection()
-		{
+		string doPProjection() {
 			return "Projecting " + oldName + " onto " + newName;
 		}
 };
@@ -230,26 +167,10 @@ class POperand
 	string op;
 	
 	public:
-	
-		POperand()
-		{
-			op = "~";
-		}
-		
-		POperand(string str)
-		{
-			op = str;
-		}
-		
-		void setPOperand(string str)
-		{
-			op = str;
-		}
-		
-		string getPOperand()
-		{
-			return op;
-		}
+		POperand() { op = "~"; }
+		POperand(string str) { op = str; }
+		void setPOperand(string str) { op = str; }
+		string getPOperand() { return op; }
 };
 
 class POp
@@ -257,25 +178,10 @@ class POp
 	string op;
 	
 	public: 
-		POp()
-		{
-			op = "~";
-		}
-		
-		POp(string str)
-		{
-			op = str;
-		}
-		
-		void setPOp(string str)
-		{
-			op = str;
-		}
-		
-		string getPOp()
-		{
-			return op;
-		}
+		POp() { op = "~"; }
+		POp(string str) { op = str; }
+		void setPOp(string str) { op = str; }
+		string getPOp() { return op; }
 };
 
 class PComparison
@@ -285,29 +191,25 @@ class PComparison
 	POperand operand2;
 	
 	public:
-		PComparison()
-		{
+		PComparison() {
 			op.setPOp("~");
 			operand1.setPOperand("~");
 			operand2.setPOperand("~");
 		}
 		
-		PComparison(string str1, string str2, string str3)
-		{
+		PComparison(string str1, string str2, string str3) {
 			operand1.setPOperand(str1);
 			op.setPOp(str2);
 			operand2.setPOperand(str3);
 		}
 		
-		void setPComparison(string str1, string str2, string str3)
-		{
+		void setPComparison(string str1, string str2, string str3) {
 			operand1.setPOperand(str1);
 			op.setPOp(str2);
 			operand2.setPOperand(str3);
 		}
 		
-		string getPComparison()
-		{
+		string getPComparison() {
 			return operand1.getPOperand() + " " + op.getPOp() + " " + operand2.getPOperand();
 		}
 };
@@ -316,25 +218,10 @@ class PConjunction
 {
 	string conj;
 	public:
-		PConjunction()
-		{
-			conj = "~";
-		}
-		
-		PConjunction(string str)
-		{
-			conj = str;
-		}
-		
-		void setPConjunction(string str)
-		{
-			conj = str;
-		}
-		
-		string getPConjunction()
-		{
-			return conj;
-		}
+		PConjunction() { conj = "~"; }
+		PConjunction(string str) { conj = str; }
+		void setPConjunction(string str) { conj = str; }
+		string getPConjunction() { return conj; }
 };
 
 class PCondition
@@ -342,45 +229,19 @@ class PCondition
 	string cond;
 	public:
 	
-		PCondition()
-		{
-			cond = "~";
-		}
-	
-		PCondition(string str)
-		{
-			cond = str;
-		}
-		
-		void setPCondition(string str)
-		{
-			cond = str;
-		}
-		
-		string getPCondition()
-		{
-			return cond;
-		}
+		PCondition() { cond = "~"; }
+		PCondition(string str) { cond = str; }
+		void setPCondition(string str) { cond = str; }
+		string getPCondition() { return cond; }
 };
 
 class PSelection
 {
 	string select;
 	public:
-		PSelection()
-		{
-			select = "~";
-		}
-		
-		PSelection(string str)
-		{
-			select = str;
-		}
-		
-		string getPSelection()
-		{
-			return select;
-		}
+		PSelection() { select = "~"; }
+		PSelection(string str) { select = str; }
+		string getPSelection() { return select; }
 };
 
 class PExpression
@@ -396,24 +257,10 @@ class PExpression
 	
 	public:
 	
-		PExpression()
-		{
-		}
-	
-		PExpression(string str)
-		{
-			temp = str;
-		}
-		
-		void setPExpression(string str)
-		{
-			temp = str;
-		}
-		
-		string getPExpression()
-		{
-			return temp;
-		}
+		PExpression() { select = "~"; }
+		PExpression(string str) { temp = str; }
+		void setPExpression(string str) { temp = str; }
+		string getPExpression() { return temp; }
 };
 
 void parse(string s, DBEngine &e);
\ No newline at end of file
diff --git a/parsertest.cpp b/parsertest.cpp
new file mode 100755
index 0000000..c3a5aa6
--- /dev/null
+++ b/parsertest.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+#include <vector>
+#include "Parser.h"
+//#include "Condition.h"
+#include "DBEngine.h"
+//#include "user.h"
+
+using namespace std;
+
+int main () {
+	DBEngine engine;
+	
+	//
+}