--- a/dependencies/python/event_controller.py	Fri Sep 17 17:42:54 2021 +0200
+++ b/dependencies/python/event_controller.py	Fri Sep 17 21:10:02 2021 +0200
@@ -1,24 +1,27 @@
-def unwrap_sentiment_string_parameters(event):
-    """
-    Unwrap string parameters from /sentiment api call
-    :param event: dict, required
-        API Gateway Lambda Proxy Input Format
-    :return:
-    """
+class SentimentFunctionEvent:
 
-    twitter_user = 'Twitter'
-    number_of_tweets = '100'
+    @staticmethod
+    def unwrap_parameters(event):
+        """
+        Unwrap string parameters from /sentiment api call
+        :param event: dict, required
+            API Gateway Lambda Proxy Input Format
+        :return:
+        """
+
+        twitter_user = 'Twitter'
+        number_of_tweets = '100'
 
-    query_string_parameters = event['queryStringParameters']
-    if event['queryStringParameters'] is not None:
-        if 'twitterUser' in query_string_parameters:
-            twitter_user = query_string_parameters['twitterUser']
-            if not twitter_user:
-                twitter_user = 'Twitter'
+        query_string_parameters = event['queryStringParameters']
+        if event['queryStringParameters'] is not None:
+            if 'twitterUser' in query_string_parameters:
+                twitter_user = query_string_parameters['twitterUser']
+                if not twitter_user:
+                    twitter_user = 'Twitter'
 
-        if 'numberOfTweets' in query_string_parameters:
-            number_of_tweets = query_string_parameters['numberOfTweets']
-            if not number_of_tweets:
-                number_of_tweets = '100'
+            if 'numberOfTweets' in query_string_parameters:
+                number_of_tweets = query_string_parameters['numberOfTweets']
+                if not number_of_tweets:
+                    number_of_tweets = '100'
 
-    return twitter_user, number_of_tweets
+        return twitter_user, number_of_tweets