diff --git a/server/commands/closepoll.ts b/server/commands/closepoll.ts
index 22c1a5f..1290882 100644
--- a/server/commands/closepoll.ts
+++ b/server/commands/closepoll.ts
@@ -15,9 +15,9 @@ export default new Command({
         const command = interaction.interaction
         const requestId = uuid()
         const guildId = command.guildId!
-        logger.info("Got command for closing poll!", { guildId: guildId, requestId })
+        logger.info("Got command for closing poll!", { guildId, requestId })
         if (!command.guild) {
-            logger.error("No guild found in interaction. Cancelling closing request", {guildId: guildId, requestId})
+            logger.error("No guild found in interaction. Cancelling closing request", { guildId, requestId })
             command.followUp("Es gab leider ein Problem. Ich konnte deine Anfrage nicht bearbeiten :(")
             return
         }
@@ -29,7 +29,7 @@ export default new Command({
 
 export async function closePoll(guild: Guild, requestId: string) {
     const guildId = guild.id
-    logger.info("stopping poll", { guildId: guildId, requestId })
+    logger.info("stopping poll", { guildId, requestId })
 
     const announcementChannel: TextChannel = client.getAnnouncementChannelForGuild(guildId)
 
@@ -39,20 +39,20 @@ export async function closePoll(guild: Guild, requestId: string) {
         .sort((a, b) => b.createdTimestamp - a.createdTimestamp)
 
     if (!messages || messages.length <= 0) {
-        logger.info("Could not find any vote messages. Cancelling pollClose", { guildId: guildId, requestId })
+        logger.info("Could not find any vote messages. Cancelling pollClose", { guildId, requestId })
         return
     }
 
     const lastMessage: Message<true> = messages[0]
 
-    logger.debug(`Found messages: ${JSON.stringify(messages, null, 2)}`, { guildId: guildId, requestId })
+    logger.debug(`Found messages: ${JSON.stringify(messages, null, 2)}`, { guildId, requestId })
 
-    logger.debug(`Last message: ${JSON.stringify(lastMessage, null, 2)}`, { guildId: guildId, requestId })
+    logger.debug(`Last message: ${JSON.stringify(lastMessage, null, 2)}`, { guildId, requestId })
 
     const votes = await (await getVotesByEmote(lastMessage, guildId, requestId))
         .sort((a, b) => b.count - a.count)
 
-    logger.debug(`votes: ${JSON.stringify(votes, null, 2)}`, { guildId: guildId, requestId })
+    logger.debug(`votes: ${JSON.stringify(votes, null, 2)}`, { guildId, requestId })
 
     updateEvent(votes, guild!, guildId, requestId)
     updateMessage(votes[0].movie, lastMessage, guildId, requestId)
@@ -67,20 +67,20 @@ async function updateMessage(movie: string, message: Message, guildId: string, r
     const options: MessageEditOptions = {
         content: body,
     }
-    logger.info("Updating message.", {guildId: guildId, requestId})
+    logger.info("Updating message.", { guildId, requestId })
     message.edit(options)
 
 }
 
 async function updateEvent(votes: Vote[], guild: Guild, guildId: string, requestId: string) {
-    logger.info(`Updating event with movie ${votes[0].movie}.`, { guildId: guildId, requestId })
+    logger.info(`Updating event with movie ${votes[0].movie}.`, { guildId, requestId })
     const voteEvents = (await guild.scheduledEvents.fetch())
         .map((value, _) => value)
         .filter(event => event.name.toLowerCase().includes("voting offen"))
-    logger.debug(`Found events: ${JSON.stringify(voteEvents, null, 2)}`, { guildId: guildId, requestId })
+    logger.debug(`Found events: ${JSON.stringify(voteEvents, null, 2)}`, { guildId, requestId })
 
     if (!voteEvents || voteEvents.length <= 0) {
-        logger.error("Could not find vote event. Cancelling update!", { guildId: guildId, requestId })
+        logger.error("Could not find vote event. Cancelling update!", { guildId, requestId })
         return
     }
 
@@ -89,8 +89,8 @@ async function updateEvent(votes: Vote[], guild: Guild, guildId: string, request
         name: votes[0].movie,
         description: `!wp\nNummer 2: ${votes[1].movie} mit ${votes[1].count - 1} Stimmen\nNummer 3: ${votes[2].movie} mit ${votes[2].count - 1} Stimmen`
     }
-    logger.debug(`Updating event: ${JSON.stringify(voteEvent, null, 2)}`, { guildId: guildId, requestId })
-    logger.info("Updating event.", {guildId: guildId, requestId})
+    logger.debug(`Updating event: ${JSON.stringify(voteEvent, null, 2)}`, { guildId, requestId })
+    logger.info("Updating event.", { guildId, requestId })
     voteEvent.edit(options)
 }
 
@@ -102,12 +102,12 @@ type Vote = {
 
 async function getVotesByEmote(message: Message, guildId: string, requestId: string): Promise<Vote[]> {
     const votes: Vote[] = []
-    logger.debug(`Number of items in emotes: ${Object.values(Emotes).length}`, {guildId: guildId, requestId})
+    logger.debug(`Number of items in emotes: ${Object.values(Emotes).length}`, { guildId, requestId })
     for (let i = 0; i < Object.keys(Emotes).length / 2; i++) {
         const emote = Emotes[i]
-        logger.debug(`Getting reaction for emote ${emote}`, { guildId: guildId, requestId })
+        logger.debug(`Getting reaction for emote ${emote}`, { guildId, requestId })
         const reaction = await message.reactions.resolve(emote)
-        logger.debug(`Reaction for emote ${emote}: ${JSON.stringify(reaction, null, 2)}`, { guildId: guildId, requestId })
+        logger.debug(`Reaction for emote ${emote}: ${JSON.stringify(reaction, null, 2)}`, { guildId, requestId })
         if (reaction) {
             const vote: Vote = { emote: emote, count: reaction.count, movie: extractMovieFromMessageByEmote(message, emote, guildId, requestId) }
             votes.push(vote)
diff --git a/server/events/guildScheduledEventUpdate.ts b/server/events/guildScheduledEventUpdate.ts
index d731b09..b479101 100644
--- a/server/events/guildScheduledEventUpdate.ts
+++ b/server/events/guildScheduledEventUpdate.ts
@@ -47,6 +47,6 @@ async function createJFUsers(members: GuildMember[], movieName: string, requestI
 }
 
 async function deleteJFUsers(guildId: string, requestId?: string) {
-    logger.info(`Watchparty ended, deleting tmp users`)
+    logger.info(`Watchparty ended, deleting tmp users`, { guildId, requestId })
     jellyfinHandler.purge(guildId, requestId)
 }
\ No newline at end of file
diff --git a/server/jellyfin/handler.ts b/server/jellyfin/handler.ts
index 7b3a202..27e26ab 100644
--- a/server/jellyfin/handler.ts
+++ b/server/jellyfin/handler.ts
@@ -230,7 +230,7 @@ export class JellyfinHandler {
   }
 
   public async getAllMovies(guildId: string, requestId: string): Promise<BaseItemDto[]> {
-    logger.info("requesting all movies from jellyfin", { guildId: guildId, requestId })
+    logger.info("requesting all movies from jellyfin", { guildId, requestId })
 
     const liloJfUser = await this.getUser(<GuildMember>{ guild: { id: guildId }, displayName: "lilo" }, requestId)
 
@@ -240,15 +240,15 @@ export class JellyfinHandler {
     }
     const movies = (await (this.moviesApi.getItems(searchParams))).items?.filter(item => !item.isFolder)
     // logger.debug(JSON.stringify(movies, null, 2), { guildId: guildId, requestId })
-    logger.info(`Found ${movies?.length} movies in total`, { guildId: guildId, requestId })
+    logger.info(`Found ${movies?.length} movies in total`, { guildId, requestId })
     return movies ?? []
   }
 
   public async getRandomMovies(count: number, guildId: string, requestId: string): Promise<BaseItemDto[]> {
-    logger.info(`${count} random movies requested.`, { guildId: guildId, requestId })
+    logger.info(`${count} random movies requested.`, { guildId, requestId })
     const allMovies = await this.getAllMovies(guildId, requestId)
     if (count >= allMovies.length) {
-      logger.info(`${count} random movies requested but found only ${allMovies.length}. Returning all Movies.`, { guildId: guildId, requestId })
+      logger.info(`${count} random movies requested but found only ${allMovies.length}. Returning all Movies.`, { guildId, requestId })
       return allMovies
     }
     const movies: BaseItemDto[] = []