diff --git a/modules/active_modifier.py b/modules/active_modifier.py
index 26550af..663b212 100644
--- a/modules/active_modifier.py
+++ b/modules/active_modifier.py
@@ -121,6 +121,6 @@ class Module(ActiveModifier):
         elif data.get("action") == "get_toplay":
             with self.file_lock:
                 with open("/tmp/radioPlayer_toplay", "r") as f:
-                    return {"status": "ok", "data": f.readlines()}
+                    return {"status": "ok", "data": [i.strip() for i in f.readlines() if i.strip()]}
 
 activemod = Module()
\ No newline at end of file
diff --git a/modules/web.py b/modules/web.py
index 9c3bdf0..9523963 100644
--- a/modules/web.py
+++ b/modules/web.py
@@ -28,13 +28,13 @@ class APIHandler(BaseHTTPRequestHandler):
             response_json = None
             while time.monotonic() - start_time < 2:
                 if id in self.data:
-                    response_json = self.data.pop(id) # Read and remove the entry
+                    response_json = self.data.pop(id)
                     break
-                time.sleep(0.05) # Wait briefly to avoid a busy loop
+                time.sleep(0.05)
             if response_json:
                 try:
                     rdata = response_json
-                    if "error" in repr(rdata): code = 500 # Server error if module reported one
+                    if "error" in repr(rdata): code = 500
                 except TypeError:
                     rdata = {"error": "Invalid data format from module"}
                     code = 500