diff --git a/APED/app/src/main/java/com/example/aped/communication/Communicator.java b/APED/app/src/main/java/com/example/aped/communication/Communicator.java
index 0b3f350..c642647 100644
--- a/APED/app/src/main/java/com/example/aped/communication/Communicator.java
+++ b/APED/app/src/main/java/com/example/aped/communication/Communicator.java
@@ -1,7 +1,5 @@
 package com.example.aped.communication;
 
-import android.content.Context;
-import android.graphics.Color;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/APED/app/src/main/java/com/example/aped/utils/ConfigurationHandler.java b/APED/app/src/main/java/com/example/aped/utils/ConfigurationHandler.java
index ee69943..d0d2873 100644
--- a/APED/app/src/main/java/com/example/aped/utils/ConfigurationHandler.java
+++ b/APED/app/src/main/java/com/example/aped/utils/ConfigurationHandler.java
@@ -247,10 +247,14 @@ public class ConfigurationHandler implements IFAVORITES {
         @NonNull
         @Override
         public String toString() {
+            List<String> favoriteNamesString = new ArrayList<>();
+            for (String favoriteName : favoriteNames){
+                favoriteNamesString.add("\"" + favoriteName + "\"");
+            }
             return "{\n"
-                    + "\"address\":\"" + address + "\",\n"
-                    + "\"port\":\"" + port + "\",\n"
-                    + "\"favorites\":" + favoriteNames.toString() + "\n"
+                    + "\t\"address\":\"" + address + "\",\n"
+                    + "\t\"port\":\"" + port + "\",\n"
+                    + "\t\"favorites\":" + favoriteNamesString.toString() + "\n"
                     + "}";
         }
     }