diff --git a/cmd/query-service/main.go b/cmd/query-service/main.go
index 9ab18605c15660ab6b7beee53e6683741fccc44d..58bfa1ae40ed0a3308cc1d7ddd3169051e14eac6 100644
--- a/cmd/query-service/main.go
+++ b/cmd/query-service/main.go
@@ -96,76 +96,76 @@ func onMessageReceived(msg amqp.Delivery) {
 	msg.Ack(true)
 }
 
-func FORGLORY() {
-	s := `{
-		"Return": {
-		  "Entities": [
-			0,
-			1
-		  ],
-		  "Relations": [
-			0
-		  ]
-		},
-		"Entities": [
-		  {
-			"Type": "airports",
-			"Constraints": [
-			  {
-				"Attribute": "country",
-				"Value": "USA",
-				"DataType": "text",
-				"MatchType": "exact"
-			  }
-			]
-		  },
-		  {
-			"Type": "airports",
-			"Constraints": [
-			  {
-				"Attribute": "city",
-				"Value": "New York",
-				"DataType": "text",
-				"MatchType": "exact"
-			  },
-			  {
-				"Attribute": "vip",
-				"Value": "true",
-				"DataType": "bool",
-				"MatchType": "exact"
-			  }
-			]
-		  }
-		],
-		"Relations": [
-		  {
-			"Type": "flights",
-			"Depth": {
-			  "min": 1,
-			  "max": 1
-			},
-			"EntityFrom": 0,
-			"EntityTo": 1,
-			"Constraints": [
-			  {
-				"Attribute": "Month",
-				"Value": "1",
-				"DataType": "number",
-				"MatchType": "exact"
-			  },
-			  {
-				"Attribute": "Day",
-				"Value": "15",
-				"DataType": "number",
-				"MatchType": "exact"
-			  }
-			]
-		  }
-		]
-	  }`
-
-	s3 := []byte(s)
-
-	yeet, _ := aql.ConvertJSONToAQL(&s3)
-	fmt.Print(*yeet)
-}
+// func FORGLORY() {
+// 	s := `{
+// 		"Return": {
+// 		  "Entities": [
+// 			0,
+// 			1
+// 		  ],
+// 		  "Relations": [
+// 			0
+// 		  ]
+// 		},
+// 		"Entities": [
+// 		  {
+// 			"Type": "airports",
+// 			"Constraints": [
+// 			  {
+// 				"Attribute": "country",
+// 				"Value": "USA",
+// 				"DataType": "text",
+// 				"MatchType": "exact"
+// 			  }
+// 			]
+// 		  },
+// 		  {
+// 			"Type": "airports",
+// 			"Constraints": [
+// 			  {
+// 				"Attribute": "city",
+// 				"Value": "New York",
+// 				"DataType": "text",
+// 				"MatchType": "exact"
+// 			  },
+// 			  {
+// 				"Attribute": "vip",
+// 				"Value": "true",
+// 				"DataType": "bool",
+// 				"MatchType": "exact"
+// 			  }
+// 			]
+// 		  }
+// 		],
+// 		"Relations": [
+// 		  {
+// 			"Type": "flights",
+// 			"Depth": {
+// 			  "min": 1,
+// 			  "max": 1
+// 			},
+// 			"EntityFrom": 0,
+// 			"EntityTo": 1,
+// 			"Constraints": [
+// 			  {
+// 				"Attribute": "Month",
+// 				"Value": "1",
+// 				"DataType": "number",
+// 				"MatchType": "exact"
+// 			  },
+// 			  {
+// 				"Attribute": "Day",
+// 				"Value": "15",
+// 				"DataType": "number",
+// 				"MatchType": "exact"
+// 			  }
+// 			]
+// 		  }
+// 		]
+// 	  }`
+
+// 	s3 := []byte(s)
+
+// 	yeet, _ := aql.ConvertJSONToAQL(&s3)
+// 	fmt.Print(*yeet)
+// }
diff --git a/internal/aql/aql.go b/internal/aql/aql.go
index 08f09b0504731db423c3ee99506342ccc5a87518..95f8e9699b6523d22ee29ff2d7d563ce68ec6895 100644
--- a/internal/aql/aql.go
+++ b/internal/aql/aql.go
@@ -148,6 +148,7 @@ func ConvertJSONToAQL(jsonMsg *[]byte) (*string, error) {
 	return result, nil
 }
 
+// createAllNodesQuery creates node queries in AQL
 func createAllNodesQuery(returnEntitiesIndices []int, entities []entityStruct) *string {
 	var (
 		result string
@@ -308,6 +309,7 @@ LET e0 = (
 RETURN e0
 
 */
+// createEdgeQuery creates an aql query for relations
 func createEdgeQuery(q *parsedJSON, name string) *string {
 	//Creation of n0 n1 let statements
 	query := ""
@@ -334,6 +336,7 @@ func createEdgeQuery(q *parsedJSON, name string) *string {
 	return &query
 }
 
+// createLetStatementForRelation creates the relation query
 func createLetStatementForRelation(relation *relationStruct, name string) *string {
 
 	letStatement := fmt.Sprintf("\nLET %s = (\n", name)
@@ -419,6 +422,7 @@ func createQueryConstraint(constraint *constraintStruct) *string {
 	return &line
 }
 
+// createEdgeQueryConstraint translates the constraints of an edge query to aql
 func createEdgeQueryConstraint(constraint *constraintStruct) *string {
 	//FILTER x.{CONSTRAINT[0]} {{CONSTRAINT[0]}.MATCHTYPE} {CONSTRAINT[0].VALUE}
 	//			name				match					value + dataType
@@ -471,6 +475,7 @@ func createEdgeQueryConstraint(constraint *constraintStruct) *string {
 	return &line
 }
 
+// convertJSONToStruct takes the json as byte array and converts it to a struct
 func convertJSONToStruct(jsonMsg *[]byte) (*parsedJSON, error) {
 	jsonStruct := parsedJSON{}
 	err := json.Unmarshal(*jsonMsg, &jsonStruct)