diff --git a/services/autodownload.service.ts b/services/autodownload.service.ts
index a568b90..76d1c26 100644
--- a/services/autodownload.service.ts
+++ b/services/autodownload.service.ts
@@ -1,11 +1,12 @@
 "use strict";
-import { Context, Service, ServiceBroker, ServiceSchema, Errors } from "moleculer";
 import { Kafka } from "kafkajs";
+import type { Context, ServiceBroker, ServiceSchema } from "moleculer";
+import { Errors, Service } from "moleculer";
 
 interface Comic {
 	wanted: {
 		markEntireVolumeWanted?: boolean;
-		issues?: Array<any>;
+		issues?: any[];
 		volume: {
 			id: string;
 			name: string;
@@ -15,10 +16,11 @@ interface Comic {
 
 export default class AutoDownloadService extends Service {
 	private kafkaProducer: any;
+
 	private readonly BATCH_SIZE = 100; // Adjust based on your system capacity
 
 	// @ts-ignore
-	public constructor(
+	constructor(
 		public broker: ServiceBroker,
 		schema: ServiceSchema<{}> = { name: "autodownload" },
 	) {
@@ -30,22 +32,20 @@ export default class AutoDownloadService extends Service {
 					rest: "POST /searchWantedComics",
 					handler: async (ctx: Context<{}>) => {
 						try {
+							/* eslint-disable no-await-in-loop */
 							let page = 1;
 							const limit = this.BATCH_SIZE;
-
-							while (true) {
-								const comics: Comic[] = await this.broker.call(
+							let comics: Comic[];
+							do {
+								comics = await this.broker.call(
 									"library.getComicsMarkedAsWanted",
 									{ page, limit },
 								);
-
-								// Log the entire result object for debugging
+								// Log debugging info
 								this.logger.info(
 									"Received comics from getComicsMarkedAsWanted:",
 									JSON.stringify(comics, null, 2),
 								);
-
-								// Check if result structure is correct
 								if (!Array.isArray(comics)) {
 									this.logger.error(
 										"Invalid response structure",
@@ -57,19 +57,14 @@ export default class AutoDownloadService extends Service {
 										"INVALID_RESPONSE_STRUCTURE",
 									);
 								}
-
 								this.logger.info(
 									`Fetched ${comics.length} comics from page ${page}`,
 								);
-
-								// Enqueue the jobs in batches
 								for (const comic of comics) {
 									await this.produceJobToKafka(comic);
 								}
-
-								if (comics.length < limit) break; // End loop if fewer comics than the limit were fetched
 								page += 1;
-							}
+							} while (comics.length === limit);
 
 							return {
 								success: true,
diff --git a/services/comicprocessor.service.ts b/services/comicprocessor.service.ts
index 2fbbaa5..39b2c7f 100644
--- a/services/comicprocessor.service.ts
+++ b/services/comicprocessor.service.ts
@@ -162,8 +162,6 @@ export default class ComicProcessorService extends Service {
 							this.airDCPPSearchResults,
 							query,
 						);
-						console.log("Final result:");
-						console.log(JSON.stringify(finalResult, null, 4));
 						/*
 							Kafka messages need to be in a format that can be serialized to JSON, 
 							and a Map is not directly serializable in a way that retains its structure, 
@@ -177,7 +175,7 @@ export default class ComicProcessorService extends Service {
 								},
 							],
 						});
-						console.log(`Produced results to Kafka.`);
+						this.logger.info(`Produced results to Kafka.`);
 
 						// socket event for UI
 						await this.broker.call("socket.broadcast", {
@@ -260,8 +258,6 @@ export default class ComicProcessorService extends Service {
 						this.airDCPPSearchResults.get(entityId).push(payload);
 					}
 
-					console.log(typeof entityId, entityId);
-					console.log(entityId);
 					console.log(
 						"Updated airDCPPSearchResults:",
 						JSON.stringify(Array.from(this.airDCPPSearchResults.entries()), null, 4),
@@ -278,15 +274,15 @@ export default class ComicProcessorService extends Service {
 
 					if (resultsForInstance) {
 						const toReplaceIndex = resultsForInstance.findIndex((element: any) => {
-							console.log("search result updated!");
-							console.log(JSON.stringify(element, null, 4));
+							this.logger.info("search result updated!");
+							this.logger.info(JSON.stringify(element, null, 4));
 							return element.id === payload.id;
 						});
 
 						if (toReplaceIndex !== -1) {
 							// Replace the existing result with the updated result
 							resultsForInstance[toReplaceIndex] = payload;
-
+rty6j
 							// Optionally, update the map with the modified array
 							this.airDCPPSearchResults.set(entityId, resultsForInstance);
 						}