diff --git a/components/event_store/service/event_logger.py b/components/event_store/service/event_logger.py
index d886372..8dfca4f 100644
--- a/components/event_store/service/event_logger.py
+++ b/components/event_store/service/event_logger.py
@@ -1,10 +1,11 @@
+import json
 import pickle
 
-from redis import StrictRedis
 from dse_shared_libs.daf import DAF
+from dse_shared_libs.message_broker_wrapper import MBWrapper
 from dse_shared_libs.target_velocity import TargetVelocity
 from dse_shared_libs.traffic_light_state import TrafficLightState
-from dse_shared_libs.message_broker_wrapper import MBWrapper
+from redis import StrictRedis
 
 
 class EventLogger:
@@ -13,6 +14,17 @@ class EventLogger:
         self.log_to_redis = log_to_redis
         self.verbose = verbose
 
+    def setup_msq_queue(self):
+        mb = MBWrapper(exchange_name='logger', callback=self.log)
+        mb.setup_receiver()
+
+    def get_keys(self):
+        return json.dumps([key.decode() for key in self.redis.keys()])
+
+    def get_value_of(self, key):
+        key = self.redis.get(key)
+        return key.decode() if key else json.dumps("")
+
     def log(self, msg):
         try:
             msg = pickle.loads(msg)
@@ -39,7 +51,3 @@ class EventLogger:
             self.redis.append(key, "{}<br>".format(to_log))
         if self.verbose:
             print(to_log)
-
-    def setup_msq_queue(self):
-        mb = MBWrapper(exchange_name='logger', callback=self.log)
-        mb.setup_receiver()
diff --git a/components/event_store/service/event_store_server.py b/components/event_store/service/event_store_server.py
index 0ec461f..837e96a 100644
--- a/components/event_store/service/event_store_server.py
+++ b/components/event_store/service/event_store_server.py
@@ -1,4 +1,3 @@
-import json
 import threading
 
 from flask import Flask
@@ -25,13 +24,12 @@ redis: StrictRedis = Redis(app)
 
 @app.route("/api/keys")
 def api_get_keys():
-    return json.dumps([key.decode() for key in redis.keys()])
+    return el.get_keys()
 
 
 @app.route("/api/keys/<key>/")
 def api_get_of_key(key):
-    key = redis.get(key)
-    return key.decode() if key else json.dumps("")
+    return el.get_value_of(key)
 
 
 @app.route("/")