diff --git a/internal/adapters/brokeradapter/brokeradapter.go b/internal/adapters/brokeradapter/brokeradapter.go
index c39ce0addfae48ccee4973c9da71c4f79b977851..724836ca611da7406f023d35dd82ce81c2ad46cc 100644
--- a/internal/adapters/brokeradapter/brokeradapter.go
+++ b/internal/adapters/brokeradapter/brokeradapter.go
@@ -12,6 +12,7 @@ type Message struct {
 type Gateway struct {
 }
 
+// CreateGateway creates a gateway
 func CreateGateway() *Gateway {
 	return &Gateway{}
 }
diff --git a/internal/adapters/brokeradapter/interface.go b/internal/adapters/brokeradapter/interface.go
index c6bea8883ecb6b7f4b486d3c0a2ea4b190a560b0..d67d8a9c09e620525725049aae5faaa85b92aac3 100644
--- a/internal/adapters/brokeradapter/interface.go
+++ b/internal/adapters/brokeradapter/interface.go
@@ -2,6 +2,7 @@ package brokeradapter
 
 import "github.com/streadway/amqp"
 
+// GatewayInterface is an interface describing a GateWay
 type GatewayInterface interface {
 	TransformMessage(msg amqp.Delivery) *Message
 }
diff --git a/internal/drivers/brokerdriver/broker.go b/internal/drivers/brokerdriver/broker.go
index 40726144e6ea285ea0ca110ddb201aaa216906df..abef043fe84c928879f35fe62903eeee52ba36a2 100644
--- a/internal/drivers/brokerdriver/broker.go
+++ b/internal/drivers/brokerdriver/broker.go
@@ -63,7 +63,7 @@ func (d *Driver) CreateConsumer() Consumer {
 	return consumer
 }
 
-// CreateAliceProducer creates an AliceProducer on a certain exchange
+// CreateProducer creates an AliceProducer on a certain exchange
 func (d *Driver) CreateProducer() Producer {
 	exchangeID := "ui-direct-exchange"
 
diff --git a/internal/drivers/brokerdriver/mock/broker.go b/internal/drivers/brokerdriver/mock/broker.go
index cd71a41d00cb4d86ebc31cc77845074da7364732..8483d8fdc1f2b4d2d25061596854daf041d79393 100644
--- a/internal/drivers/brokerdriver/mock/broker.go
+++ b/internal/drivers/brokerdriver/mock/broker.go
@@ -5,16 +5,19 @@ import (
 	"query-service/internal/drivers/brokerdriver"
 )
 
+// Driver is mock gateway
 type Driver struct {
 	gateway brokeradapter.GatewayInterface
 }
 
+// CreateBroker is a creates a mock driver
 func CreateBroker(gateway brokeradapter.GatewayInterface) *Driver {
 	return &Driver{
 		gateway: gateway,
 	}
 }
 
+// CreateConsumer creates a mock consumer
 func (d *Driver) CreateConsumer() brokerdriver.Consumer {
 	return &Consumer{
 		broker: d,
diff --git a/internal/drivers/brokerdriver/mock/consumer.go b/internal/drivers/brokerdriver/mock/consumer.go
index b8200113fb2edd5741b30ded8a483b25ee32540e..b3391265198146245752370f2f559524e73df65b 100644
--- a/internal/drivers/brokerdriver/mock/consumer.go
+++ b/internal/drivers/brokerdriver/mock/consumer.go
@@ -2,14 +2,17 @@ package mockbrokerdriver
 
 import "query-service/internal/adapters/brokeradapter"
 
+// Consumer is a mock consumer
 type Consumer struct {
 	broker *Driver
 }
 
+// ConsumeMessages mocks the consume messages func
 func (c *Consumer) ConsumeMessages() {
 
 }
 
+// SetMessageHandler mocks the setting of a message handler
 func (c *Consumer) SetMessageHandler(handler func(msg *brokeradapter.Message)) {
 
 }
diff --git a/internal/entity/redis.go b/internal/entity/redis.go
deleted file mode 100644
index 30fd277bb23cc4326b9b63ef3509c3b8f0a16804..0000000000000000000000000000000000000000
--- a/internal/entity/redis.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package entity
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"query-service/pkg/logger"
-
-	"github.com/go-redis/redis/v8"
-)
-
-// RedisClient is the Redis client used throughout the service
-var RedisClient *redis.Client
-
-// NewRedisClient creates a new redis client
-func NewRedisClient() {
-	
-}
diff --git a/internal/usecases/request/request.go b/internal/usecases/request/request.go
index e146a5497c12f05bd3d3ae6b7a925acf67509add..51b451600aa95af457884e1678edab0a097cc21b 100644
--- a/internal/usecases/request/request.go
+++ b/internal/usecases/request/request.go
@@ -13,9 +13,11 @@ import (
 	"github.com/arangodb/go-driver/http"
 )
 
+// Service is a struct used to store this use case in
 type Service struct {
 }
 
+// NewService creates a new instantion of this use case
 func NewService() *Service {
 	return &Service{}
 }