diff --git a/.nuget/NuGet.config b/.nuget/NuGet.config
index 4a4e2f52b4..f672dcab53 100644
--- a/.nuget/NuGet.config
+++ b/.nuget/NuGet.config
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <configuration>
-  <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-  <packageSourceMapping>
-  <packageSource key="nuget.org">
-    <package pattern="*" />
-  </packageSource>
-</packageSourceMapping>
+	<packageSources>
+		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+	</packageSources>
+	<packageSourceMapping>
+		<packageSource key="nuget.org">
+			<package pattern="*" />
+		</packageSource>
+	</packageSourceMapping>
 </configuration>
diff --git a/Directory.Build.props b/Directory.Build.props
index 63fb1b5f0e..f38df2a939 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project>
-  <ItemGroup>
-    <SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
-  </ItemGroup>
+	<ItemGroup>
+		<SourceRoot Include="$(MSBuildThisFileDirectory)/" />
+	</ItemGroup>
 	<PropertyGroup>
 		<!--<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)/DisCatSharp.Tools/DisCatSharp.ruleset</CodeAnalysisRuleSet>-->
-    <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
+		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 	</PropertyGroup>
 </Project>
diff --git a/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs b/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs
index 8b36f5e5a3..750b2af07a 100644
--- a/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs
+++ b/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs
@@ -88,7 +88,8 @@ public sealed class ApplicationCommandsExtension : BaseExtension
 	public IReadOnlyList<KeyValuePair<ulong?, IReadOnlyList<RegisteredDiscordApplicationCommand>>> RegisteredCommands
 		=> s_registeredCommands.Select(guild =>
 			new KeyValuePair<ulong?, IReadOnlyList<RegisteredDiscordApplicationCommand>>(guild.Key, guild.Value
-					.Select(parent => new RegisteredDiscordApplicationCommand(parent)).ToList())).ToList();
+				.Select(parent => new RegisteredDiscordApplicationCommand(parent)).ToList())).ToList();
+
 	private static List<KeyValuePair<ulong?, IReadOnlyList<DiscordApplicationCommand>>> s_registeredCommands = new();
 
 	/// <summary>
@@ -96,6 +97,7 @@ public sealed class ApplicationCommandsExtension : BaseExtension
 	/// </summary>
 	public IReadOnlyList<DiscordApplicationCommand> GlobalCommands
 		=> GlobalCommandsInternal;
+
 	internal static List<DiscordApplicationCommand> GlobalCommandsInternal = new();
 
 	/// <summary>
@@ -103,6 +105,7 @@ public IReadOnlyList<DiscordApplicationCommand> GlobalCommands
 	/// </summary>
 	public IReadOnlyDictionary<ulong, IReadOnlyList<DiscordApplicationCommand>> GuildCommands
 		=> GuildCommandsInternal;
+
 	internal static Dictionary<ulong, IReadOnlyList<DiscordApplicationCommand>> GuildCommandsInternal = new();
 
 	/// <summary>
@@ -150,7 +153,6 @@ internal static LogLevel ApplicationCommandsLogLevel
 	/// </summary>
 	internal bool StartupFinished { get; set; } = false;
 
-
 	/// <summary>
 	/// Gets the service provider this module was configured with.
 	/// </summary>
@@ -168,7 +170,7 @@ public IServiceProvider Services
 	/// <param name="configuration">The configuration.</param>
 	internal ApplicationCommandsExtension(ApplicationCommandsConfiguration configuration = null)
 	{
-		configuration ??= new ApplicationCommandsConfiguration();
+		configuration ??= new();
 		Configuration = configuration;
 		DebugEnabled = configuration?.DebugStartup ?? false;
 		CheckAllGuilds = configuration?.CheckAllGuilds ?? false;
@@ -189,14 +191,14 @@ protected internal override void Setup(DiscordClient client)
 		this.Client = client;
 		Logger = client.Logger;
 
-		this._slashError = new AsyncEvent<ApplicationCommandsExtension, SlashCommandErrorEventArgs>("SLASHCOMMAND_ERRORED", TimeSpan.Zero, null);
-		this._slashExecuted = new AsyncEvent<ApplicationCommandsExtension, SlashCommandExecutedEventArgs>("SLASHCOMMAND_EXECUTED", TimeSpan.Zero, null);
-		this._contextMenuErrored = new AsyncEvent<ApplicationCommandsExtension, ContextMenuErrorEventArgs>("CONTEXTMENU_ERRORED", TimeSpan.Zero, null);
-		this._contextMenuExecuted = new AsyncEvent<ApplicationCommandsExtension, ContextMenuExecutedEventArgs>("CONTEXTMENU_EXECUTED", TimeSpan.Zero, null);
-		this._applicationCommandsModuleReady = new AsyncEvent<ApplicationCommandsExtension, ApplicationCommandsModuleReadyEventArgs>("APPLICATION_COMMANDS_MODULE_READY", TimeSpan.Zero, null);
-		this._applicationCommandsModuleStartupFinished = new AsyncEvent<ApplicationCommandsExtension, ApplicationCommandsModuleStartupFinishedEventArgs>("APPLICATION_COMMANDS_MODULE_STARTUP_FINISHED", TimeSpan.Zero, null);
-		this._globalApplicationCommandsRegistered = new AsyncEvent<ApplicationCommandsExtension, GlobalApplicationCommandsRegisteredEventArgs>("GLOBAL_COMMANDS_REGISTERED", TimeSpan.Zero, null);
-		this._guildApplicationCommandsRegistered = new AsyncEvent<ApplicationCommandsExtension, GuildApplicationCommandsRegisteredEventArgs>("GUILD_COMMANDS_REGISTERED", TimeSpan.Zero, null);
+		this._slashError = new("SLASHCOMMAND_ERRORED", TimeSpan.Zero, null);
+		this._slashExecuted = new("SLASHCOMMAND_EXECUTED", TimeSpan.Zero, null);
+		this._contextMenuErrored = new("CONTEXTMENU_ERRORED", TimeSpan.Zero, null);
+		this._contextMenuExecuted = new("CONTEXTMENU_EXECUTED", TimeSpan.Zero, null);
+		this._applicationCommandsModuleReady = new("APPLICATION_COMMANDS_MODULE_READY", TimeSpan.Zero, null);
+		this._applicationCommandsModuleStartupFinished = new("APPLICATION_COMMANDS_MODULE_STARTUP_FINISHED", TimeSpan.Zero, null);
+		this._globalApplicationCommandsRegistered = new("GLOBAL_COMMANDS_REGISTERED", TimeSpan.Zero, null);
+		this._guildApplicationCommandsRegistered = new("GUILD_COMMANDS_REGISTERED", TimeSpan.Zero, null);
 
 		this.Client.GuildDownloadCompleted += (c, e) =>
 		{
@@ -233,6 +235,7 @@ private void FinishedRegistration()
 		this.Client.InteractionCreated += this.InteractionHandler;
 		this.Client.ContextMenuInteractionCreated += this.ContextMenuHandler;
 	}
+
 	/// <summary>
 	/// Cleans the module for a new start of the bot.
 	/// DO NOT USE IF YOU DON'T KNOW WHAT IT DOES.
@@ -309,7 +312,7 @@ public void RegisterGlobalCommands(Assembly assembly)
 	/// <param name="guildId">The guild id to register it on.</param>
 	/// <param name="translationSetup">A callback to setup translations with.</param>
 	public void RegisterGuildCommands<T>(ulong guildId, Action<ApplicationCommandsTranslationContext> translationSetup = null) where T : ApplicationCommandsModule
-		=> this._updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>(guildId, new ApplicationCommandsModuleConfiguration(typeof(T), translationSetup)));
+		=> this._updateList.Add(new(guildId, new(typeof(T), translationSetup)));
 
 	/// <summary>
 	/// Registers a command class with optional translation setup for a guild.
@@ -321,7 +324,8 @@ public void RegisterGuildCommands(Type type, ulong guildId, Action<ApplicationCo
 	{
 		if (!typeof(ApplicationCommandsModule).IsAssignableFrom(type))
 			throw new ArgumentException("Command classes have to inherit from ApplicationCommandsModule", nameof(type));
-		this._updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>(guildId, new ApplicationCommandsModuleConfiguration(type, translationSetup)));
+
+		this._updateList.Add(new(guildId, new(type, translationSetup)));
 	}
 
 	/// <summary>
@@ -330,7 +334,7 @@ public void RegisterGuildCommands(Type type, ulong guildId, Action<ApplicationCo
 	/// <typeparam name="T">The command class to register.</typeparam>
 	/// <param name="translationSetup">A callback to setup translations with.</param>
 	public void RegisterGlobalCommands<T>(Action<ApplicationCommandsTranslationContext> translationSetup = null) where T : ApplicationCommandsModule
-		=> this._updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>(null, new ApplicationCommandsModuleConfiguration(typeof(T), translationSetup)));
+		=> this._updateList.Add(new(null, new(typeof(T), translationSetup)));
 
 	/// <summary>
 	/// Registers a command class with optional translation setup globally.
@@ -341,7 +345,8 @@ public void RegisterGlobalCommands(Type type, Action<ApplicationCommandsTranslat
 	{
 		if (!typeof(ApplicationCommandsModule).IsAssignableFrom(type))
 			throw new ArgumentException("Command classes have to inherit from ApplicationCommandsModule", nameof(type));
-		this._updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>(null, new ApplicationCommandsModuleConfiguration(type, translationSetup)));
+
+		this._updateList.Add(new(null, new(type, translationSetup)));
 	}
 
 	/// <summary>
@@ -352,6 +357,7 @@ public event AsyncEventHandler<ApplicationCommandsExtension, ApplicationCommands
 		add => this._applicationCommandsModuleReady.Register(value);
 		remove => this._applicationCommandsModuleReady.Unregister(value);
 	}
+
 	private AsyncEvent<ApplicationCommandsExtension, ApplicationCommandsModuleReadyEventArgs> _applicationCommandsModuleReady;
 
 	/// <summary>
@@ -362,8 +368,8 @@ public event AsyncEventHandler<ApplicationCommandsExtension, ApplicationCommands
 		add => this._applicationCommandsModuleStartupFinished.Register(value);
 		remove => this._applicationCommandsModuleStartupFinished.Unregister(value);
 	}
-	private AsyncEvent<ApplicationCommandsExtension, ApplicationCommandsModuleStartupFinishedEventArgs> _applicationCommandsModuleStartupFinished;
 
+	private AsyncEvent<ApplicationCommandsExtension, ApplicationCommandsModuleStartupFinishedEventArgs> _applicationCommandsModuleStartupFinished;
 
 	/// <summary>
 	/// Fired when guild commands are registered on a guild.
@@ -373,6 +379,7 @@ public event AsyncEventHandler<ApplicationCommandsExtension, GuildApplicationCom
 		add => this._guildApplicationCommandsRegistered.Register(value);
 		remove => this._guildApplicationCommandsRegistered.Unregister(value);
 	}
+
 	private AsyncEvent<ApplicationCommandsExtension, GuildApplicationCommandsRegisteredEventArgs> _guildApplicationCommandsRegistered;
 
 	/// <summary>
@@ -383,6 +390,7 @@ public event AsyncEventHandler<ApplicationCommandsExtension, GlobalApplicationCo
 		add => this._globalApplicationCommandsRegistered.Register(value);
 		remove => this._globalApplicationCommandsRegistered.Unregister(value);
 	}
+
 	private AsyncEvent<ApplicationCommandsExtension, GlobalApplicationCommandsRegisteredEventArgs> _globalApplicationCommandsRegistered;
 
 	/// <summary>
@@ -446,15 +454,16 @@ internal async Task UpdateAsync()
 
 		//Default should be to add the help and slash commands can be added without setting any configuration
 		//so this should still add the default help
-		if (Configuration is null || (Configuration is not null && Configuration.EnableDefaultHelp))
+		if (Configuration is null || Configuration is not null && Configuration.EnableDefaultHelp)
 		{
-			updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>
-				(null, new ApplicationCommandsModuleConfiguration(typeof(DefaultHelpModule))));
+			updateList.Add(new(null, new(typeof(DefaultHelpModule))));
 			commandsPending = updateList.Select(x => x.Key).Distinct().ToList();
-		} else {
-			try {
-				updateList.Remove(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>
-				(null, new ApplicationCommandsModuleConfiguration(typeof(DefaultHelpModule))));
+		}
+		else
+		{
+			try
+			{
+				updateList.Remove(new(null, new(typeof(DefaultHelpModule))));
 			}
 			catch
 			{ }
@@ -473,12 +482,13 @@ internal async Task UpdateAsync()
 				this.Client.Logger.Log(ApplicationCommandsLogLevel, "Found guild {guild} in shard {shard}!", key.Value, this.Client.ShardId);
 				this.Client.Logger.Log(ApplicationCommandsLogLevel, "Registering");
 			}
+
 			await this.RegisterCommands(updateList.Where(x => x.Key == key).Select(x => x.Value).ToList(), key).ConfigureAwait(false);
 		}
 
 		this._missingScopeGuildIds = new(failedGuilds);
 
-		await this._applicationCommandsModuleReady.InvokeAsync(this, new ApplicationCommandsModuleReadyEventArgs(Configuration?.ServiceProvider)
+		await this._applicationCommandsModuleReady.InvokeAsync(this, new(Configuration?.ServiceProvider)
 		{
 			GuildsWithoutScope = failedGuilds
 		}).ConfigureAwait(false);
@@ -519,9 +529,7 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 				//Add module to classes list if it's a group
 				var extremeNestedGroup = false;
 				if (module.GetCustomAttribute<SlashCommandGroupAttribute>() != null)
-				{
 					classes.Add(module);
-				}
 				else if (module.GetMembers(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static).Any(x => x.IsDefined(typeof(SlashCommandGroupAttribute))))
 				{
 					//Otherwise add the extreme nested groups
@@ -531,19 +539,15 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 					extremeNestedGroup = true;
 				}
 				else
-				{
 					//Otherwise add the nested groups
 					classes = module.DeclaredNestedTypes.Where(x => x.GetCustomAttribute<SlashCommandGroupAttribute>() != null).ToList();
-				}
 
 				if (module.GetCustomAttribute<SlashCommandGroupAttribute>() != null || extremeNestedGroup)
 				{
 					List<GroupTranslator> groupTranslations = null;
 
 					if (!string.IsNullOrEmpty(ctx.GroupTranslations))
-					{
 						groupTranslations = JsonConvert.DeserializeObject<List<GroupTranslator>>(ctx.GroupTranslations);
-					}
 
 					var slashGroupsTuple = await NestedCommandWorker.ParseSlashGroupsAsync(type, classes, guildId, groupTranslations).ConfigureAwait(false);
 
@@ -555,7 +559,6 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 							var cgwsgs = new List<CommandGroupWithSubGroups>();
 							var cgs2 = new List<CommandGroup>();
 							foreach (var cmd in slashGroupsTuple.applicationCommands)
-							{
 								if (cmd.Type == ApplicationCommandType.ChatInput)
 								{
 									var cgs = new List<CommandGroup>();
@@ -563,28 +566,24 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 									{
 										var cs = new List<Command>();
 										foreach (var sc in scg.Options)
-										{
 											if (sc.Options == null || !sc.Options.Any())
-												cs.Add(new Command(sc.Name, sc.Description, null, null));
+												cs.Add(new(sc.Name, sc.Description, null, null));
 											else
-												cs.Add(new Command(sc.Name, sc.Description, sc.Options.ToList(), null));
-										}
-										cgs.Add(new CommandGroup(scg.Name, scg.Description, cs, null));
+												cs.Add(new(sc.Name, sc.Description, sc.Options.ToList(), null));
+										cgs.Add(new(scg.Name, scg.Description, cs, null));
 									}
-									cgwsgs.Add(new CommandGroupWithSubGroups(cmd.Name, cmd.Description, cgs, ApplicationCommandType.ChatInput));
+
+									cgwsgs.Add(new(cmd.Name, cmd.Description, cgs, ApplicationCommandType.ChatInput));
 
 									var cs2 = new List<Command>();
 									foreach (var sc2 in cmd.Options.Where(x => x.Type == ApplicationCommandOptionType.SubCommand))
-									{
 										if (sc2.Options == null || !sc2.Options.Any())
-											cs2.Add(new Command(sc2.Name, sc2.Description, null, null));
+											cs2.Add(new(sc2.Name, sc2.Description, null, null));
 										else
-											cs2.Add(new Command(sc2.Name, sc2.Description, sc2.Options.ToList(), null));
-									}
-									cgs2.Add(new CommandGroup(cmd.Name, cmd.Description, cs2, ApplicationCommandType.ChatInput));
-
+											cs2.Add(new(sc2.Name, sc2.Description, sc2.Options.ToList(), null));
+									cgs2.Add(new(cmd.Name, cmd.Description, cs2, ApplicationCommandType.ChatInput));
 								}
-							}
+
 							if (cgwsgs.Any())
 								foreach (var cgwsg in cgwsgs)
 									groupTranslation.Add(JsonConvert.DeserializeObject<GroupTranslator>(JsonConvert.SerializeObject(cgwsg)));
@@ -613,9 +612,7 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 					List<CommandTranslator> commandTranslations = null;
 
 					if (!string.IsNullOrEmpty(ctx.SingleTranslations))
-					{
 						commandTranslations = JsonConvert.DeserializeObject<List<CommandTranslator>>(ctx.SingleTranslations);
-					}
 
 					//Slash commands
 					var methods = module.DeclaredMethods.Where(x => x.GetCustomAttribute<SlashCommandAttribute>() != null);
@@ -632,10 +629,11 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 								if (cmd.Type == ApplicationCommandType.ChatInput && (cmd.Options == null || !cmd.Options.Any(x => x.Type == ApplicationCommandOptionType.SubCommand || x.Type == ApplicationCommandOptionType.SubCommandGroup)))
 								{
 									if (cmd.Options == null || !cmd.Options.Any())
-										cs.Add(new Command(cmd.Name, cmd.Description, null, ApplicationCommandType.ChatInput));
+										cs.Add(new(cmd.Name, cmd.Description, null, ApplicationCommandType.ChatInput));
 									else
-										cs.Add(new Command(cmd.Name, cmd.Description, cmd.Options.ToList(), ApplicationCommandType.ChatInput));
+										cs.Add(new(cmd.Name, cmd.Description, cmd.Options.ToList(), ApplicationCommandType.ChatInput));
 								}
+
 							if (cs.Any())
 								foreach (var c in cs)
 									translation.Add(JsonConvert.DeserializeObject<CommandTranslator>(JsonConvert.SerializeObject(c)));
@@ -661,7 +659,7 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 							var cs = new List<Command>();
 							foreach (var cmd in contextCommands.applicationCommands)
 								if (cmd.Type == ApplicationCommandType.Message || cmd.Type == ApplicationCommandType.User)
-									cs.Add(new Command(cmd.Name, null, null, cmd.Type));
+									cs.Add(new(cmd.Name, null, null, cmd.Type));
 							if (cs.Any())
 								foreach (var c in cs)
 									translation.Add(JsonConvert.DeserializeObject<CommandTranslator>(JsonConvert.SerializeObject(c)));
@@ -686,9 +684,7 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 			catch (Exception ex)
 			{
 				if (ex is BadRequestException brex)
-				{
 					this.Client.Logger.LogCritical(brex, @"There was an error registering application commands: {res}", brex.WebResponse.Response);
-				}
 				else
 				{
 					if (ex.InnerException is not null && ex.InnerException is BadRequestException brex1)
@@ -696,9 +692,11 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 					else
 						this.Client.Logger.LogCritical(ex, @"There was an error parsing the application commands");
 				}
+
 				s_errored = true;
 			}
 		}
+
 		if (!s_errored)
 		{
 			updateList = updateList.DistinctBy(x => x.Name).ToList();
@@ -708,7 +706,6 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 				this.CheckRegistrationStartup(ManOr, translation, groupTranslation);
 			}
 			else
-			{
 				try
 				{
 					List<DiscordApplicationCommand> commands = new();
@@ -725,9 +722,7 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 								GlobalCommandsInternal.AddRange(actualCommands);
 							}
 							else
-							{
 								foreach (var cmd in GlobalDiscordCommands)
-								{
 									try
 									{
 										await this.Client.DeleteGlobalApplicationCommandAsync(cmd.Id).ConfigureAwait(false);
@@ -736,8 +731,6 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 									{
 										this.Client.Logger.Log(ApplicationCommandsLogLevel, "Could not delete global command {cmdId}. Please clean up manually", cmd.Id);
 									}
-								}
-							}
 						}
 						else
 						{
@@ -756,9 +749,7 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 								{ }
 							}
 							else
-							{
 								foreach (var cmd in GuildDiscordCommands.First(x => x.Key == guildId.Value).Value)
-								{
 									try
 									{
 										await this.Client.DeleteGuildApplicationCommandAsync(guildId.Value, cmd.Id).ConfigureAwait(false);
@@ -767,8 +758,6 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 									{
 										this.Client.Logger.Log(ApplicationCommandsLogLevel, "Could not delete guild command {cmdId} in guild {guildId}. Please clean up manually", cmd.Id, guildId.Value);
 									}
-								}
-							}
 						}
 					}
 					catch (UnauthorizedException ex)
@@ -776,6 +765,7 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 						this.Client.Logger.LogError("Could not register application commands for guild {guildId}.\nError: {exc}", guildId, ex.JsonMessage);
 						return;
 					}
+
 					//Creates a guild command if a guild id is specified, otherwise global
 					//Checks against the ids and adds them to the command method lists
 					foreach (var command in commands)
@@ -796,7 +786,7 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 					SubGroupCommands.AddRange(subGroupCommands.DistinctBy(x => x.Name));
 					ContextMenuCommands.AddRange(contextMenuCommands.DistinctBy(x => x.Name));
 
-					s_registeredCommands.Add(new KeyValuePair<ulong?, IReadOnlyList<DiscordApplicationCommand>>(guildId, commands.ToList()));
+					s_registeredCommands.Add(new(guildId, commands.ToList()));
 
 					foreach (var command in commandMethods)
 					{
@@ -806,22 +796,15 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 					this.Client.Logger.Log(ApplicationCommandsLogLevel, "Expected Count: {exp}\nCurrent Count: {cur}", s_expectedCount, s_registrationCount);
 
 					if (guildId.HasValue)
-					{
-						await this._guildApplicationCommandsRegistered.InvokeAsync(this, new GuildApplicationCommandsRegisteredEventArgs(Configuration?.ServiceProvider)
+						await this._guildApplicationCommandsRegistered.InvokeAsync(this, new(Configuration?.ServiceProvider)
 						{
-							Handled = true,
-							GuildId = guildId.Value,
-							RegisteredCommands = GuildCommandsInternal.Any(c => c.Key == guildId.Value) ? GuildCommandsInternal.FirstOrDefault(c => c.Key == guildId.Value).Value : null
+							Handled = true, GuildId = guildId.Value, RegisteredCommands = GuildCommandsInternal.Any(c => c.Key == guildId.Value) ? GuildCommandsInternal.FirstOrDefault(c => c.Key == guildId.Value).Value : null
 						}).ConfigureAwait(false);
-					}
 					else
-					{
-						await this._globalApplicationCommandsRegistered.InvokeAsync(this, new GlobalApplicationCommandsRegisteredEventArgs(Configuration?.ServiceProvider)
+						await this._globalApplicationCommandsRegistered.InvokeAsync(this, new(Configuration?.ServiceProvider)
 						{
-							Handled = true,
-							RegisteredCommands = GlobalCommandsInternal
+							Handled = true, RegisteredCommands = GlobalCommandsInternal
 						}).ConfigureAwait(false);
-					}
 
 					s_registrationCount++;
 					this.CheckRegistrationStartup(ManOr);
@@ -833,9 +816,7 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 				catch (Exception ex)
 				{
 					if (ex is BadRequestException brex)
-					{
 						this.Client.Logger.LogCritical(brex, @"There was an error registering application commands: {res}", brex.WebResponse.Response);
-					}
 					else
 					{
 						if (ex.InnerException is not null && ex.InnerException is BadRequestException brex1)
@@ -843,9 +824,9 @@ private async Task RegisterCommands(List<ApplicationCommandsModuleConfiguration>
 						else
 							this.Client.Logger.LogCritical(ex, @"There was an general error registering application commands");
 					}
+
 					s_errored = true;
 				}
-			}
 		}
 	}
 
@@ -855,12 +836,9 @@ private async void CheckRegistrationStartup(bool man = false, List<CommandTransl
 
 		if (s_registrationCount == s_expectedCount || man)
 		{
-			await this._applicationCommandsModuleStartupFinished.InvokeAsync(this, new ApplicationCommandsModuleStartupFinishedEventArgs(Configuration?.ServiceProvider)
+			await this._applicationCommandsModuleStartupFinished.InvokeAsync(this, new(Configuration?.ServiceProvider)
 			{
-				Handled = true,
-				RegisteredGlobalCommands = GlobalCommandsInternal,
-				RegisteredGuildCommands = GuildCommandsInternal,
-				GuildsWithoutScope = this._missingScopeGuildIds
+				Handled = true, RegisteredGlobalCommands = GlobalCommandsInternal, RegisteredGuildCommands = GuildCommandsInternal, GuildsWithoutScope = this._missingScopeGuildIds
 			}).ConfigureAwait(false);
 			if (Configuration.GenerateTranslationFilesOnly)
 			{
@@ -907,13 +885,12 @@ private async void CheckRegistrationStartup(bool man = false, List<CommandTransl
 					this.Client.Logger.LogError(@"{msg}", ex.Message);
 					this.Client.Logger.LogError(@"{stack}", ex.StackTrace);
 				}
+
 				this.FinishedRegistration();
 				await this.Client.DisconnectAsync().ConfigureAwait(false);
 			}
 			else
-			{
 				this.FinishedRegistration();
-			}
 		}
 	}
 
@@ -931,7 +908,7 @@ private Task InteractionHandler(DiscordClient client, InteractionCreateEventArgs
 			return Task.FromResult(true);
 		}
 
-	HandledInteractions.Add(e.Interaction.Id);
+		HandledInteractions.Add(e.Interaction.Id);
 
 		_ = Task.Run(async () =>
 		{
@@ -1028,11 +1005,17 @@ private Task InteractionHandler(DiscordClient client, InteractionCreateEventArgs
 							}
 						}
 
-						await this._slashExecuted.InvokeAsync(this, new SlashCommandExecutedEventArgs(this.Client.ServiceProvider) { Context = context }).ConfigureAwait(false);
+						await this._slashExecuted.InvokeAsync(this, new(this.Client.ServiceProvider)
+						{
+							Context = context
+						}).ConfigureAwait(false);
 					}
 					catch (Exception ex)
 					{
-						await this._slashError.InvokeAsync(this, new SlashCommandErrorEventArgs(this.Client.ServiceProvider) { Context = context, Exception = ex }).ConfigureAwait(false);
+						await this._slashError.InvokeAsync(this, new(this.Client.ServiceProvider)
+						{
+							Context = context, Exception = ex
+						}).ConfigureAwait(false);
 						this.Client.Logger.LogError(ex, "Error in slash interaction");
 					}
 
@@ -1082,7 +1065,10 @@ private Task InteractionHandler(DiscordClient client, InteractionCreateEventArgs
 								EntitlementSkuIds = e.Interaction.EntitlementSkuIds
 							};
 
-							var choices = await ((Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>>) providerMethod.Invoke(providerInstance, new[] { context })).ConfigureAwait(false);
+							var choices = await ((Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>>)providerMethod.Invoke(providerInstance, new[]
+							{
+								context
+							})).ConfigureAwait(false);
 							await e.Interaction.CreateResponseAsync(InteractionResponseType.AutoCompleteResult, new DiscordInteractionResponseBuilder().AddAutoCompleteChoices(choices)).ConfigureAwait(false);
 						}
 
@@ -1115,7 +1101,10 @@ private Task InteractionHandler(DiscordClient client, InteractionCreateEventArgs
 								EntitlementSkuIds = e.Interaction.EntitlementSkuIds
 							};
 
-							var choices = await ((Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>>) providerMethod.Invoke(providerInstance, new[] { context })).ConfigureAwait(false);
+							var choices = await ((Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>>)providerMethod.Invoke(providerInstance, new[]
+							{
+								context
+							})).ConfigureAwait(false);
 							await e.Interaction.CreateResponseAsync(InteractionResponseType.AutoCompleteResult, new DiscordInteractionResponseBuilder().AddAutoCompleteChoices(choices)).ConfigureAwait(false);
 						}
 
@@ -1149,7 +1138,10 @@ private Task InteractionHandler(DiscordClient client, InteractionCreateEventArgs
 								EntitlementSkuIds = e.Interaction.EntitlementSkuIds
 							};
 
-							var choices = await ((Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>>) providerMethod.Invoke(providerInstance, new[] { context })).ConfigureAwait(false);
+							var choices = await ((Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>>)providerMethod.Invoke(providerInstance, new[]
+							{
+								context
+							})).ConfigureAwait(false);
 							await e.Interaction.CreateResponseAsync(InteractionResponseType.AutoCompleteResult, new DiscordInteractionResponseBuilder().AddAutoCompleteChoices(choices)).ConfigureAwait(false);
 						}
 					}
@@ -1171,9 +1163,10 @@ private ApplicationCommandFinalType GetInteractionType(DiscordInteractionData da
 		if (data.Options == null!)
 			return ApplicationCommandFinalType.Command;
 		if (data.Options.All(x =>
-			    x.Type is not ApplicationCommandOptionType.SubCommand
-				    and not ApplicationCommandOptionType.SubCommandGroup))
+			x.Type is not ApplicationCommandOptionType.SubCommand
+				and not ApplicationCommandOptionType.SubCommandGroup))
 			return ApplicationCommandFinalType.Command;
+
 		if (data.Options.Any(x => x.Type is ApplicationCommandOptionType.SubCommandGroup))
 			type = ApplicationCommandFinalType.SubCommandGroup;
 		else if (data.Options.Any(x => x.Type is ApplicationCommandOptionType.SubCommand))
@@ -1239,13 +1232,22 @@ private Task ContextMenuHandler(DiscordClient client, ContextMenuInteractionCrea
 					throw new InvalidOperationException("A context menu command was executed, but no command was registered for it.");
 				}
 
-				await this.RunCommandAsync(context, method.Method, new[] { context }).ConfigureAwait(false);
+				await this.RunCommandAsync(context, method.Method, new[]
+				{
+					context
+				}).ConfigureAwait(false);
 
-				await this._contextMenuExecuted.InvokeAsync(this, new ContextMenuExecutedEventArgs(this.Client.ServiceProvider) { Context = context }).ConfigureAwait(false);
+				await this._contextMenuExecuted.InvokeAsync(this, new(this.Client.ServiceProvider)
+				{
+					Context = context
+				}).ConfigureAwait(false);
 			}
 			catch (Exception ex)
 			{
-				await this._contextMenuErrored.InvokeAsync(this, new ContextMenuErrorEventArgs(this.Client.ServiceProvider) { Context = context, Exception = ex }).ConfigureAwait(false);
+				await this._contextMenuErrored.InvokeAsync(this, new(this.Client.ServiceProvider)
+				{
+					Context = context, Exception = ex
+				}).ConfigureAwait(false);
 			}
 		});
 
@@ -1284,7 +1286,7 @@ internal async Task RunCommandAsync(BaseContext context, MethodInfo method, IEnu
 				break;
 
 			default:
-				throw new Exception($"An unknown {nameof(ApplicationCommandModuleLifespanAttribute)} scope was specified on command {context.CommandName}");
+				throw new($"An unknown {nameof(ApplicationCommandModuleLifespanAttribute)} scope was specified on command {context.CommandName}");
 		}
 
 		ApplicationCommandsModule module = null;
@@ -1307,6 +1309,7 @@ internal async Task RunCommandAsync(BaseContext context, MethodInfo method, IEnu
 				await (module?.AfterSlashExecutionAsync(slashContext) ?? Task.CompletedTask).ConfigureAwait(false);
 			}
 		}
+
 		// Context menus
 		if (context is ContextMenuContext contextMenuContext)
 		{
@@ -1394,11 +1397,13 @@ internal static object CreateInstance(Type t, IServiceProvider services)
 	/// <param name="options">The options.</param>
 	private async Task<List<object>> ResolveInteractionCommandParameters(InteractionCreateEventArgs e, InteractionContext context, MethodInfo method, IEnumerable<DiscordInteractionDataOption> options)
 	{
-		var args = new List<object> { context };
+		var args = new List<object>
+		{
+			context
+		};
 		var parameters = method.GetParameters().Skip(1);
 
 		foreach (var parameter in parameters)
-		{
 			//Accounts for optional arguments without values given
 			if (parameter.IsOptional && (options == null || (!options?.Any(x => x.Name == parameter.GetCustomAttribute<OptionAttribute>().Name.ToLower()) ?? true)))
 				args.Add(parameter.DefaultValue);
@@ -1429,19 +1434,22 @@ private async Task<List<object>> ResolveInteractionCommandParameters(Interaction
 				{
 					//Checks through resolved
 					if (e.Interaction.Data.Resolved.Attachments != null &&
-						e.Interaction.Data.Resolved.Attachments.TryGetValue((ulong)option.Value, out var attachment))
+					    e.Interaction.Data.Resolved.Attachments.TryGetValue((ulong)option.Value, out var attachment))
 						args.Add(attachment);
 					else
-						args.Add(new DiscordAttachment() { Id = (ulong)option.Value, Discord = this.Client.ApiClient.Discord });
+						args.Add(new DiscordAttachment()
+						{
+							Id = (ulong)option.Value, Discord = this.Client.ApiClient.Discord
+						});
 				}
 				else if (parameter.ParameterType == typeof(DiscordUser))
 				{
 					//Checks through resolved
 					if (e.Interaction.Data.Resolved.Members != null &&
-						e.Interaction.Data.Resolved.Members.TryGetValue((ulong)option.Value, out var member))
+					    e.Interaction.Data.Resolved.Members.TryGetValue((ulong)option.Value, out var member))
 						args.Add(member);
 					else if (e.Interaction.Data.Resolved.Users != null &&
-							 e.Interaction.Data.Resolved.Users.TryGetValue((ulong)option.Value, out var user))
+					         e.Interaction.Data.Resolved.Users.TryGetValue((ulong)option.Value, out var user))
 						args.Add(user);
 					else
 						args.Add(await this.Client.GetUserAsync((ulong)option.Value).ConfigureAwait(false));
@@ -1450,7 +1458,7 @@ private async Task<List<object>> ResolveInteractionCommandParameters(Interaction
 				{
 					//Checks through resolved
 					if (e.Interaction.Data.Resolved.Channels != null &&
-						e.Interaction.Data.Resolved.Channels.TryGetValue((ulong)option.Value, out var channel))
+					    e.Interaction.Data.Resolved.Channels.TryGetValue((ulong)option.Value, out var channel))
 						args.Add(channel);
 					else
 						args.Add(e.Interaction.Guild.GetChannel((ulong)option.Value));
@@ -1459,7 +1467,7 @@ private async Task<List<object>> ResolveInteractionCommandParameters(Interaction
 				{
 					//Checks through resolved
 					if (e.Interaction.Data.Resolved.Roles != null &&
-						e.Interaction.Data.Resolved.Roles.TryGetValue((ulong)option.Value, out var role))
+					    e.Interaction.Data.Resolved.Roles.TryGetValue((ulong)option.Value, out var role))
 						args.Add(role);
 					else
 						args.Add(e.Interaction.Guild.GetRole((ulong)option.Value));
@@ -1481,7 +1489,6 @@ private async Task<List<object>> ResolveInteractionCommandParameters(Interaction
 				else
 					throw new ArgumentException($"Error resolving interaction.");
 			}
-		}
 
 		return args;
 	}
@@ -1503,9 +1510,7 @@ private async Task RunPreexecutionChecksAsync(MethodInfo method, BaseContext con
 			{
 				attributes.AddRange(method.DeclaringType.DeclaringType.GetCustomAttributes<ApplicationCommandCheckBaseAttribute>());
 				if (method.DeclaringType.DeclaringType.DeclaringType != null)
-				{
 					attributes.AddRange(method.DeclaringType.DeclaringType.DeclaringType.GetCustomAttributes<ApplicationCommandCheckBaseAttribute>());
-				}
 			}
 
 			var dict = new Dictionary<ApplicationCommandCheckBaseAttribute, bool>();
@@ -1518,8 +1523,12 @@ private async Task RunPreexecutionChecksAsync(MethodInfo method, BaseContext con
 
 			//Checks if any failed, and throws an exception
 			if (dict.Any(x => x.Value == false))
-				throw new SlashExecutionChecksFailedException { FailedChecks = dict.Where(x => x.Value == false).Select(x => x.Key).ToList() };
+				throw new SlashExecutionChecksFailedException
+				{
+					FailedChecks = dict.Where(x => x.Value == false).Select(x => x.Key).ToList()
+				};
 		}
+
 		if (context is ContextMenuContext cMctx)
 		{
 			var attributes = new List<ApplicationCommandCheckBaseAttribute>();
@@ -1529,9 +1538,7 @@ private async Task RunPreexecutionChecksAsync(MethodInfo method, BaseContext con
 			{
 				attributes.AddRange(method.DeclaringType.DeclaringType.GetCustomAttributes<ApplicationCommandCheckBaseAttribute>());
 				if (method.DeclaringType.DeclaringType.DeclaringType != null)
-				{
 					attributes.AddRange(method.DeclaringType.DeclaringType.DeclaringType.GetCustomAttributes<ApplicationCommandCheckBaseAttribute>());
-				}
 			}
 
 			var dict = new Dictionary<ApplicationCommandCheckBaseAttribute, bool>();
@@ -1544,7 +1551,10 @@ private async Task RunPreexecutionChecksAsync(MethodInfo method, BaseContext con
 
 			//Checks if any failed, and throws an exception
 			if (dict.Any(x => x.Value == false))
-				throw new ContextMenuExecutionChecksFailedException { FailedChecks = dict.Where(x => x.Value == false).Select(x => x.Key).ToList() };
+				throw new ContextMenuExecutionChecksFailedException
+				{
+					FailedChecks = dict.Where(x => x.Value == false).Select(x => x.Key).ToList()
+				};
 		}
 	}
 
@@ -1580,9 +1590,7 @@ private static async Task<List<DiscordApplicationCommandOptionChoice>> GetChoice
 				var result = await ((Task<IEnumerable<DiscordApplicationCommandOptionChoice>>)method.Invoke(instance, null)).ConfigureAwait(false);
 
 				if (result.Any())
-				{
 					choices.AddRange(result);
-				}
 			}
 		}
 
@@ -1597,9 +1605,7 @@ private static List<DiscordApplicationCommandOptionChoice> GetChoiceAttributesFr
 	{
 		var choices = new List<DiscordApplicationCommandOptionChoice>();
 		foreach (Enum enumValue in Enum.GetValues(enumParam))
-		{
-			choices.Add(new DiscordApplicationCommandOptionChoice(enumValue.GetName(), enumValue.ToString()));
-		}
+			choices.Add(new(enumValue.GetName(), enumValue.ToString()));
 		return choices;
 	}
 
@@ -1612,24 +1618,24 @@ private static ApplicationCommandOptionType GetParameterType(Type type)
 		var parameterType = type == typeof(string)
 			? ApplicationCommandOptionType.String
 			: type == typeof(long) || type == typeof(long?) || type == typeof(int) || type == typeof(int?)
-			? ApplicationCommandOptionType.Integer
-			: type == typeof(bool) || type == typeof(bool?)
-			? ApplicationCommandOptionType.Boolean
-			: type == typeof(double) || type == typeof(double?)
-			? ApplicationCommandOptionType.Number
-			: type == typeof(DiscordAttachment)
-			? ApplicationCommandOptionType.Attachment
-			: type == typeof(DiscordChannel)
-			? ApplicationCommandOptionType.Channel
-			: type == typeof(DiscordUser)
-			? ApplicationCommandOptionType.User
-			: type == typeof(DiscordRole)
-			? ApplicationCommandOptionType.Role
-			: type == typeof(SnowflakeObject)
-			? ApplicationCommandOptionType.Mentionable
-			: type.IsEnum
-			? ApplicationCommandOptionType.String
-			: throw new ArgumentException("Cannot convert type! Argument types must be string, int, long, bool, double, DiscordChannel, DiscordUser, DiscordRole, SnowflakeObject, DiscordAttachment or an Enum.");
+				? ApplicationCommandOptionType.Integer
+				: type == typeof(bool) || type == typeof(bool?)
+					? ApplicationCommandOptionType.Boolean
+					: type == typeof(double) || type == typeof(double?)
+						? ApplicationCommandOptionType.Number
+						: type == typeof(DiscordAttachment)
+							? ApplicationCommandOptionType.Attachment
+							: type == typeof(DiscordChannel)
+								? ApplicationCommandOptionType.Channel
+								: type == typeof(DiscordUser)
+									? ApplicationCommandOptionType.User
+									: type == typeof(DiscordRole)
+										? ApplicationCommandOptionType.Role
+										: type == typeof(SnowflakeObject)
+											? ApplicationCommandOptionType.Mentionable
+											: type.IsEnum
+												? ApplicationCommandOptionType.String
+												: throw new ArgumentException("Cannot convert type! Argument types must be string, int, long, bool, double, DiscordChannel, DiscordUser, DiscordRole, SnowflakeObject, DiscordAttachment or an Enum.");
 		return parameterType;
 	}
 
@@ -1690,17 +1696,13 @@ internal static async Task<List<DiscordApplicationCommandOption>> ParseParameter
 			var choices = GetChoiceAttributesFromParameter(parameter.GetCustomAttributes<ChoiceAttribute>());
 			//From enums
 			if (parameter.ParameterType.IsEnum)
-			{
 				choices = GetChoiceAttributesFromEnumParameter(parameter.ParameterType);
-			}
 			//From choice provider
 			var choiceProviders = parameter.GetCustomAttributes<ChoiceProviderAttribute>();
 			if (choiceProviders.Any())
-			{
 				choices = await GetChoiceAttributesFromProvider(choiceProviders, guildId).ConfigureAwait(false);
-			}
 
-			options.Add(new DiscordApplicationCommandOption(optionAttribute.Name, optionAttribute.Description, parameterType, !parameter.IsOptional, choices, null, channelTypes, optionAttribute.Autocomplete, minimumValue, maximumValue, minimumLength: minimumLength, maximumLength: maximumLength));
+			options.Add(new(optionAttribute.Name, optionAttribute.Description, parameterType, !parameter.IsOptional, choices, null, channelTypes, optionAttribute.Autocomplete, minimumValue, maximumValue, minimumLength: minimumLength, maximumLength: maximumLength));
 		}
 
 		return options;
@@ -1741,6 +1743,7 @@ public event AsyncEventHandler<ApplicationCommandsExtension, SlashCommandErrorEv
 		add => this._slashError.Register(value);
 		remove => this._slashError.Unregister(value);
 	}
+
 	private AsyncEvent<ApplicationCommandsExtension, SlashCommandErrorEventArgs> _slashError;
 
 	/// <summary>
@@ -1751,6 +1754,7 @@ public event AsyncEventHandler<ApplicationCommandsExtension, SlashCommandExecute
 		add => this._slashExecuted.Register(value);
 		remove => this._slashExecuted.Unregister(value);
 	}
+
 	private AsyncEvent<ApplicationCommandsExtension, SlashCommandExecutedEventArgs> _slashExecuted;
 
 	/// <summary>
@@ -1761,6 +1765,7 @@ public event AsyncEventHandler<ApplicationCommandsExtension, ContextMenuErrorEve
 		add => this._contextMenuErrored.Register(value);
 		remove => this._contextMenuErrored.Unregister(value);
 	}
+
 	private AsyncEvent<ApplicationCommandsExtension, ContextMenuErrorEventArgs> _contextMenuErrored;
 
 	/// <summary>
@@ -1771,6 +1776,7 @@ public event AsyncEventHandler<ApplicationCommandsExtension, ContextMenuExecuted
 		add => this._contextMenuExecuted.Register(value);
 		remove => this._contextMenuExecuted.Unregister(value);
 	}
+
 	private AsyncEvent<ApplicationCommandsExtension, ContextMenuExecutedEventArgs> _contextMenuExecuted;
 }
 
@@ -1907,6 +1913,7 @@ internal class ContextMenuCommand
 }
 
 #region Default Help
+
 /// <summary>
 /// Represents the default help module.
 /// </summary>
@@ -1941,9 +1948,7 @@ public async Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>> Prov
 			}
 
 			foreach (var sc in slashCommands.Take(25))
-			{
-				options.Add(new DiscordApplicationCommandAutocompleteChoice(sc.Name, sc.Name.Trim()));
-			}
+				options.Add(new(sc.Name, sc.Name.Trim()));
 			return options.AsEnumerable();
 		}
 	}
@@ -1972,20 +1977,17 @@ public async Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>> Prov
 			}
 
 			var command = slashCommands.FirstOrDefault(ac =>
-				ac.Name.Equals(context.Options[0].Value.ToString().Trim(),StringComparison.OrdinalIgnoreCase));
+				ac.Name.Equals(context.Options[0].Value.ToString().Trim(), StringComparison.OrdinalIgnoreCase));
 			if (command is null || command.Options is null)
-			{
-				options.Add(new DiscordApplicationCommandAutocompleteChoice("no_options_for_this_command", "no_options_for_this_command"));
-			}
+				options.Add(new("no_options_for_this_command", "no_options_for_this_command"));
 			else
 			{
 				var opt = command.Options.Where(c => c.Type is ApplicationCommandOptionType.SubCommandGroup or ApplicationCommandOptionType.SubCommand
-													 && c.Name.StartsWith(context.Options[1].Value.ToString(), StringComparison.InvariantCultureIgnoreCase)).ToList();
+				                                     && c.Name.StartsWith(context.Options[1].Value.ToString(), StringComparison.InvariantCultureIgnoreCase)).ToList();
 				foreach (var option in opt.Take(25))
-				{
-					options.Add(new DiscordApplicationCommandAutocompleteChoice(option.Name, option.Name.Trim()));
-				}
+					options.Add(new(option.Name, option.Name.Trim()));
 			}
+
 			return options.AsEnumerable();
 		}
 	}
@@ -2017,41 +2019,44 @@ public async Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>> Prov
 				ac.Name.Equals(context.Options[0].Value.ToString().Trim(), StringComparison.OrdinalIgnoreCase));
 			if (command.Options is null)
 			{
-				options.Add(new DiscordApplicationCommandAutocompleteChoice("no_options_for_this_command", "no_options_for_this_command"));
+				options.Add(new("no_options_for_this_command", "no_options_for_this_command"));
 				return options.AsEnumerable();
 			}
+
 			var foundCommand = command.Options.FirstOrDefault(op => op.Name.Equals(context.Options[1].Value.ToString().Trim(), StringComparison.OrdinalIgnoreCase));
 			if (foundCommand is null || foundCommand.Options is null)
-			{
-				options.Add(new DiscordApplicationCommandAutocompleteChoice("no_options_for_this_command", "no_options_for_this_command"));
-			}
+				options.Add(new("no_options_for_this_command", "no_options_for_this_command"));
 			else
 			{
 				var opt = foundCommand.Options.Where(x => x.Type == ApplicationCommandOptionType.SubCommand &&
-														  x.Name.StartsWith(context.Options[2].Value.ToString(), StringComparison.OrdinalIgnoreCase)).ToList();
+				                                          x.Name.StartsWith(context.Options[2].Value.ToString(), StringComparison.OrdinalIgnoreCase)).ToList();
 				foreach (var option in opt.Take(25))
-				{
-					options.Add(new DiscordApplicationCommandAutocompleteChoice(option.Name, option.Name.Trim()));
-				}
+					options.Add(new(option.Name, option.Name.Trim()));
 			}
+
 			return options.AsEnumerable();
 		}
 	}
 
 	[SlashCommand("help", "Displays command help")]
-	internal async Task DefaultHelpAsync(InteractionContext ctx,
-		[Autocomplete(typeof(DefaultHelpAutoCompleteProvider))]
-		[Option("option_one", "top level command to provide help for", true)] string commandName,
-		[Autocomplete(typeof(DefaultHelpAutoCompleteLevelOneProvider))]
-		[Option("option_two", "subgroup or command to provide help for", true)] string commandOneName = null,
-		[Autocomplete(typeof(DefaultHelpAutoCompleteLevelTwoProvider))]
-		[Option("option_three", "command to provide help for", true)] string commandTwoName = null)
+	internal async Task DefaultHelpAsync(
+		InteractionContext ctx,
+		[Autocomplete(typeof(DefaultHelpAutoCompleteProvider)), Option("option_one", "top level command to provide help for", true)]
+		
+		string commandName,
+		[Autocomplete(typeof(DefaultHelpAutoCompleteLevelOneProvider)), Option("option_two", "subgroup or command to provide help for", true)]
+		
+		string commandOneName = null,
+		[Autocomplete(typeof(DefaultHelpAutoCompleteLevelTwoProvider)), Option("option_three", "command to provide help for", true)]
+		
+		string commandTwoName = null
+	)
 	{
 		List<DiscordApplicationCommand> applicationCommands = null;
 		var globalCommandsTask = ctx.Client.GetGlobalApplicationCommandsAsync();
 		if (ctx.Guild != null)
 		{
-			var guildCommandsTask= ctx.Client.GetGuildApplicationCommandsAsync(ctx.Guild.Id);
+			var guildCommandsTask = ctx.Client.GetGuildApplicationCommandsAsync(ctx.Guild.Id);
 			await Task.WhenAll(globalCommandsTask, guildCommandsTask).ConfigureAwait(false);
 			applicationCommands = globalCommandsTask.Result.Concat(guildCommandsTask.Result)
 				.Where(ac => !ac.Name.Equals("help", StringComparison.OrdinalIgnoreCase))
@@ -2077,17 +2082,17 @@ await ctx.EditResponseAsync(new DiscordWebhookBuilder()
 					.WithContent($"There are no slash commands").AsEphemeral()).ConfigureAwait(false);
 			return;
 		}
+
 		if (commandTwoName is not null && !commandTwoName.Equals("no_options_for_this_command"))
 		{
 			var commandsWithSubCommands = applicationCommands.FindAll(ac => ac.Options is not null && ac.Options.Any(op => op.Type == ApplicationCommandOptionType.SubCommandGroup));
-			var subCommandParent = commandsWithSubCommands.FirstOrDefault(cm => cm.Name.Equals(commandName,StringComparison.OrdinalIgnoreCase));
+			var subCommandParent = commandsWithSubCommands.FirstOrDefault(cm => cm.Name.Equals(commandName, StringComparison.OrdinalIgnoreCase));
 			var cmdParent = commandsWithSubCommands.FirstOrDefault(cm => cm.Options.Any(op => op.Name.Equals(commandOneName))).Options
-					.FirstOrDefault(opt => opt.Name.Equals(commandOneName,StringComparison.OrdinalIgnoreCase));
-			var cmd = cmdParent.Options.FirstOrDefault(op => op.Name.Equals(commandTwoName,StringComparison.OrdinalIgnoreCase));
+				.FirstOrDefault(opt => opt.Name.Equals(commandOneName, StringComparison.OrdinalIgnoreCase));
+			var cmd = cmdParent.Options.FirstOrDefault(op => op.Name.Equals(commandTwoName, StringComparison.OrdinalIgnoreCase));
 			var discordEmbed = new DiscordEmbedBuilder
 			{
-				Title = "Help",
-				Description = $"{subCommandParent.Mention.Replace(subCommandParent.Name, $"{subCommandParent.Name} {cmdParent.Name} {cmd.Name}")}: {cmd.Description ?? "No description provided."}"
+				Title = "Help", Description = $"{subCommandParent.Mention.Replace(subCommandParent.Name, $"{subCommandParent.Name} {cmdParent.Name} {cmd.Name}")}: {cmd.Description ?? "No description provided."}"
 			};
 			if (cmd.Options is not null)
 			{
@@ -2098,8 +2103,9 @@ await ctx.EditResponseAsync(new DiscordWebhookBuilder()
 					sb.Append('`').Append(option.Name).Append("`: ").Append(option.Description ?? "No description provided.").Append('\n');
 
 				sb.Append('\n');
-				discordEmbed.AddField(new DiscordEmbedField("Arguments", sb.ToString().Trim()));
+				discordEmbed.AddField(new("Arguments", sb.ToString().Trim()));
 			}
+
 			if (ApplicationCommandsExtension.Configuration.AutoDefer)
 				await ctx.EditResponseAsync(new DiscordWebhookBuilder()
 					.AddEmbed(discordEmbed)).ConfigureAwait(false);
@@ -2110,12 +2116,11 @@ await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource,
 		else if (commandOneName is not null && commandTwoName is null && !commandOneName.Equals("no_options_for_this_command"))
 		{
 			var commandsWithOptions = applicationCommands.FindAll(ac => ac.Options is not null && ac.Options.All(op => op.Type == ApplicationCommandOptionType.SubCommand));
-			var subCommandParent = commandsWithOptions.FirstOrDefault(cm => cm.Name.Equals(commandName,StringComparison.OrdinalIgnoreCase));
-			var subCommand = subCommandParent.Options.FirstOrDefault(op => op.Name.Equals(commandOneName,StringComparison.OrdinalIgnoreCase));
+			var subCommandParent = commandsWithOptions.FirstOrDefault(cm => cm.Name.Equals(commandName, StringComparison.OrdinalIgnoreCase));
+			var subCommand = subCommandParent.Options.FirstOrDefault(op => op.Name.Equals(commandOneName, StringComparison.OrdinalIgnoreCase));
 			var discordEmbed = new DiscordEmbedBuilder
 			{
-				Title = "Help",
-				Description = $"{subCommandParent.Mention.Replace(subCommandParent.Name, $"{subCommandParent.Name} {subCommand.Name}")}: {subCommand.Description ?? "No description provided."}"
+				Title = "Help", Description = $"{subCommandParent.Mention.Replace(subCommandParent.Name, $"{subCommandParent.Name} {subCommand.Name}")}: {subCommand.Description ?? "No description provided."}"
 			};
 			if (subCommand.Options is not null)
 			{
@@ -2126,7 +2131,7 @@ await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource,
 					sb.Append('`').Append(option.Name).Append("`: ").Append(option.Description ?? "No description provided.").Append('\n');
 
 				sb.Append('\n');
-				discordEmbed.AddField(new DiscordEmbedField("Arguments", sb.ToString().Trim()));
+				discordEmbed.AddField(new("Arguments", sb.ToString().Trim()));
 			}
 
 			if (ApplicationCommandsExtension.Configuration.AutoDefer)
@@ -2148,11 +2153,11 @@ await ctx.EditResponseAsync(new DiscordWebhookBuilder()
 						.WithContent($"No command called {commandName} in guild {ctx.Guild.Name}").AsEphemeral()).ConfigureAwait(false);
 				return;
 			}
+
 			var discordEmbed = new DiscordEmbedBuilder
 			{
-				Title = "Help",
-				Description = $"{command.Mention}: {command.Description ?? "No description provided."}"
-			}.AddField(new DiscordEmbedField("Command is NSFW", command.IsNsfw.ToString()));
+				Title = "Help", Description = $"{command.Mention}: {command.Description ?? "No description provided."}"
+			}.AddField(new("Command is NSFW", command.IsNsfw.ToString()));
 			if (command.Options is not null)
 			{
 				var commandOptions = command.Options.ToList();
@@ -2162,8 +2167,9 @@ await ctx.EditResponseAsync(new DiscordWebhookBuilder()
 					sb.Append('`').Append(option.Name).Append("`: ").Append(option.Description ?? "No description provided.").Append('\n');
 
 				sb.Append('\n');
-				discordEmbed.AddField(new DiscordEmbedField("Arguments", sb.ToString().Trim()));
+				discordEmbed.AddField(new("Arguments", sb.ToString().Trim()));
 			}
+
 			if (ApplicationCommandsExtension.Configuration.AutoDefer)
 				await ctx.EditResponseAsync(new DiscordWebhookBuilder().AddEmbed(discordEmbed)).ConfigureAwait(false);
 			else
@@ -2172,4 +2178,5 @@ await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource,
 		}
 	}
 }
+
 #endregion
diff --git a/DisCatSharp.ApplicationCommands/ApplicationCommandsUtilities.cs b/DisCatSharp.ApplicationCommands/ApplicationCommandsUtilities.cs
index 48bc175e1c..51e25b7be3 100644
--- a/DisCatSharp.ApplicationCommands/ApplicationCommandsUtilities.cs
+++ b/DisCatSharp.ApplicationCommands/ApplicationCommandsUtilities.cs
@@ -83,6 +83,7 @@ internal static bool IsCommandCandidate(this MethodInfo method, out ParameterInf
 				ApplicationCommandsExtension.Logger.LogDebug("Not existent");
 			return false;
 		}
+
 		if (ApplicationCommandsExtension.DebugEnabled)
 			ApplicationCommandsExtension.Logger.LogDebug("Checking method {name}", method.Name);
 
@@ -96,7 +97,7 @@ internal static bool IsCommandCandidate(this MethodInfo method, out ParameterInf
 
 		// check if appropriate return and arguments
 		parameters = method.GetParameters();
-		if (!parameters.Any() || (parameters.First().ParameterType != typeof(ContextMenuContext) && parameters.First().ParameterType != typeof(InteractionContext)) || method.ReturnType != typeof(Task))
+		if (!parameters.Any() || parameters.First().ParameterType != typeof(ContextMenuContext) && parameters.First().ParameterType != typeof(InteractionContext) || method.ReturnType != typeof(Task))
 		{
 			if (ApplicationCommandsExtension.DebugEnabled)
 				ApplicationCommandsExtension.Logger.LogDebug("Missing first parameter with type ContextMenuContext or InteractionContext");
diff --git a/DisCatSharp.ApplicationCommands/Attributes/ContextMenu/ContextMenuAttribute.cs b/DisCatSharp.ApplicationCommands/Attributes/ContextMenu/ContextMenuAttribute.cs
index 36e5839de6..5632a4306f 100644
--- a/DisCatSharp.ApplicationCommands/Attributes/ContextMenu/ContextMenuAttribute.cs
+++ b/DisCatSharp.ApplicationCommands/Attributes/ContextMenu/ContextMenuAttribute.cs
@@ -69,7 +69,6 @@ public ContextMenuAttribute(ApplicationCommandType type, string name, bool isNsf
 		this.IntegrationTypes = integrationTypes?.ToList();
 	}
 
-
 	/// <summary>
 	/// Marks this method as a context menu.
 	/// </summary>
@@ -93,7 +92,6 @@ public ContextMenuAttribute(ApplicationCommandType type, string name, long defau
 		this.IntegrationTypes = integrationTypes?.ToList();
 	}
 
-
 	/// <summary>
 	/// Marks this method as context menu.
 	/// </summary>
diff --git a/DisCatSharp.ApplicationCommands/Attributes/ContextMenu/ContextMenuCooldownAttribute.cs b/DisCatSharp.ApplicationCommands/Attributes/ContextMenu/ContextMenuCooldownAttribute.cs
index 4a0dc8b167..c8371902fd 100644
--- a/DisCatSharp.ApplicationCommands/Attributes/ContextMenu/ContextMenuCooldownAttribute.cs
+++ b/DisCatSharp.ApplicationCommands/Attributes/ContextMenu/ContextMenuCooldownAttribute.cs
@@ -45,7 +45,7 @@ public ContextMenuCooldownAttribute(int maxUses, double resetAfter, CooldownBuck
 		this.MaxUses = maxUses;
 		this.Reset = TimeSpan.FromSeconds(resetAfter);
 		this.BucketType = bucketType;
-		this.Buckets = new ConcurrentDictionary<string, ContextMenuCooldownBucket>();
+		this.Buckets = new();
 	}
 
 	/// <summary>
@@ -68,7 +68,11 @@ public ContextMenuCooldownBucket GetBucket(BaseContext ctx)
 	public TimeSpan GetRemainingCooldown(BaseContext ctx)
 	{
 		var bucket = this.GetBucket(ctx);
-		return bucket == null ? TimeSpan.Zero : bucket.RemainingUses > 0 ? TimeSpan.Zero : bucket.ResetsAt - DateTimeOffset.UtcNow;
+		return bucket == null
+			? TimeSpan.Zero
+			: bucket.RemainingUses > 0
+				? TimeSpan.Zero
+				: bucket.ResetsAt - DateTimeOffset.UtcNow;
 	}
 
 	/// <summary>
@@ -108,7 +112,7 @@ public override async Task<bool> ExecuteChecksAsync(BaseContext ctx)
 		var bid = this.GetBucketId(ctx, out var usr, out var chn, out var gld);
 		if (!this.Buckets.TryGetValue(bid, out var bucket))
 		{
-			bucket = new ContextMenuCooldownBucket(this.MaxUses, this.Reset, usr, chn, gld);
+			bucket = new(this.MaxUses, this.Reset, usr, chn, gld);
 			this.Buckets.AddOrUpdate(bid, bucket, (k, v) => bucket);
 		}
 
@@ -123,8 +127,7 @@ public sealed class ContextMenuCooldownBucket : CooldownBucket
 {
 	internal ContextMenuCooldownBucket(int maxUses, TimeSpan resetAfter, ulong userId = 0, ulong channelId = 0, ulong guildId = 0)
 		: base(maxUses, resetAfter, userId, channelId, guildId)
-	{
-	}
+	{ }
 
 	/// <summary>
 	/// Returns a string representation of this command cooldown bucket.
diff --git a/DisCatSharp.ApplicationCommands/Attributes/RequirePermissionsAttribute.cs b/DisCatSharp.ApplicationCommands/Attributes/RequirePermissionsAttribute.cs
index 087bacf1cf..ad300e6e16 100644
--- a/DisCatSharp.ApplicationCommands/Attributes/RequirePermissionsAttribute.cs
+++ b/DisCatSharp.ApplicationCommands/Attributes/RequirePermissionsAttribute.cs
@@ -44,11 +44,13 @@ public override async Task<bool> ExecuteChecksAsync(BaseContext ctx)
 		var usr = ctx.Member;
 		if (usr == null)
 			return false;
+
 		var pusr = ctx.Channel.PermissionsFor(usr);
 
 		var bot = await ctx.Guild.GetMemberAsync(ctx.Client.CurrentUser.Id).ConfigureAwait(false);
 		if (bot == null)
 			return false;
+
 		var pbot = ctx.Channel.PermissionsFor(bot);
 
 		var usrok = ctx.Guild.OwnerId == usr.Id;
diff --git a/DisCatSharp.ApplicationCommands/Attributes/RequirePremiumAttribute.cs b/DisCatSharp.ApplicationCommands/Attributes/RequirePremiumAttribute.cs
index 013e1e8f48..d9e5979d24 100644
--- a/DisCatSharp.ApplicationCommands/Attributes/RequirePremiumAttribute.cs
+++ b/DisCatSharp.ApplicationCommands/Attributes/RequirePremiumAttribute.cs
@@ -54,7 +54,7 @@ public override async Task<bool> ExecuteChecksAsync(BaseContext ctx)
 /// <summary>
 /// Defines that usage of this application command is restricted to users with a test entitlement.
 /// </summary>
-[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = false),RequiresFeature(Features.MonetizedApplication)]
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = false), RequiresFeature(Features.MonetizedApplication)]
 public sealed class ApplicationCommandRequirePremiumTestAttribute : ApplicationCommandCheckBaseAttribute
 {
 	/// <summary>
diff --git a/DisCatSharp.ApplicationCommands/Attributes/RequireUserPermissionsAttribute.cs b/DisCatSharp.ApplicationCommands/Attributes/RequireUserPermissionsAttribute.cs
index ce957e1896..21a9817639 100644
--- a/DisCatSharp.ApplicationCommands/Attributes/RequireUserPermissionsAttribute.cs
+++ b/DisCatSharp.ApplicationCommands/Attributes/RequireUserPermissionsAttribute.cs
@@ -52,6 +52,8 @@ public override Task<bool> ExecuteChecksAsync(BaseContext ctx)
 
 		return (pusr & Permissions.Administrator) != 0
 			? Task.FromResult(true)
-			: (pusr & this.Permissions) == this.Permissions ? Task.FromResult(true) : Task.FromResult(false);
+			: (pusr & this.Permissions) == this.Permissions
+				? Task.FromResult(true)
+				: Task.FromResult(false);
 	}
 }
diff --git a/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/ChoiceProviderAttribute.cs b/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/ChoiceProviderAttribute.cs
index ef8ef64450..6188635fec 100644
--- a/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/ChoiceProviderAttribute.cs
+++ b/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/ChoiceProviderAttribute.cs
@@ -9,7 +9,6 @@ namespace DisCatSharp.ApplicationCommands.Attributes;
 [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = true)]
 public class ChoiceProviderAttribute : Attribute
 {
-
 	/// <summary>
 	/// The type of the provider.
 	/// </summary>
diff --git a/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/MinimumMaximumAttribute.cs b/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/MinimumMaximumAttribute.cs
index a2930874c0..654c53abb1 100644
--- a/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/MinimumMaximumAttribute.cs
+++ b/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/MinimumMaximumAttribute.cs
@@ -74,7 +74,6 @@ public MaximumValueAttribute(double value)
 	}
 }
 
-
 /// <summary>
 /// Sets a minimum value for this slash command option. Only valid for <see cref="string"/> parameters.
 /// </summary>
@@ -93,6 +92,7 @@ public MinimumLengthAttribute(int value)
 	{
 		if (value > 600)
 			throw new ArgumentException("Minimum cannot be more than 6000.");
+
 		this.Value = value;
 	}
 }
@@ -115,6 +115,7 @@ public MaximumLengthAttribute(int value)
 	{
 		if (value == 0 || value > 600)
 			throw new ArgumentException("Maximum length cannot be less than 1 and cannot be more than 6000.");
+
 		this.Value = value;
 	}
 }
diff --git a/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/SlashCommandCooldownAttribute.cs b/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/SlashCommandCooldownAttribute.cs
index 90d97af6bc..64ec59a68f 100644
--- a/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/SlashCommandCooldownAttribute.cs
+++ b/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/SlashCommandCooldownAttribute.cs
@@ -45,7 +45,7 @@ public SlashCommandCooldownAttribute(int maxUses, double resetAfter, CooldownBuc
 		this.MaxUses = maxUses;
 		this.Reset = TimeSpan.FromSeconds(resetAfter);
 		this.BucketType = bucketType;
-		this.Buckets = new ConcurrentDictionary<string, SlashCommandCooldownBucket>();
+		this.Buckets = new();
 	}
 
 	/// <summary>
@@ -68,7 +68,11 @@ public SlashCommandCooldownBucket GetBucket(BaseContext ctx)
 	public TimeSpan GetRemainingCooldown(BaseContext ctx)
 	{
 		var bucket = this.GetBucket(ctx);
-		return bucket == null ? TimeSpan.Zero : bucket.RemainingUses > 0 ? TimeSpan.Zero : bucket.ResetsAt - DateTimeOffset.UtcNow;
+		return bucket == null
+			? TimeSpan.Zero
+			: bucket.RemainingUses > 0
+				? TimeSpan.Zero
+				: bucket.ResetsAt - DateTimeOffset.UtcNow;
 	}
 
 	/// <summary>
@@ -108,7 +112,7 @@ public override async Task<bool> ExecuteChecksAsync(BaseContext ctx)
 		var bid = this.GetBucketId(ctx, out var usr, out var chn, out var gld);
 		if (!this.Buckets.TryGetValue(bid, out var bucket))
 		{
-			bucket = new SlashCommandCooldownBucket(this.MaxUses, this.Reset, usr, chn, gld);
+			bucket = new(this.MaxUses, this.Reset, usr, chn, gld);
 			this.Buckets.AddOrUpdate(bid, bucket, (k, v) => bucket);
 		}
 
@@ -129,7 +133,5 @@ public sealed class SlashCommandCooldownBucket : CooldownBucket
 
 	internal SlashCommandCooldownBucket(int maxUses, TimeSpan resetAfter, ulong userId = 0, ulong channelId = 0, ulong guildId = 0)
 		: base(maxUses, resetAfter, userId, channelId, guildId)
-	{
-
-	}
+	{ }
 }
diff --git a/DisCatSharp.ApplicationCommands/Checks/ApplicationCommandEqualityChecks.cs b/DisCatSharp.ApplicationCommands/Checks/ApplicationCommandEqualityChecks.cs
index f8310b6cf5..d784c2aa36 100644
--- a/DisCatSharp.ApplicationCommands/Checks/ApplicationCommandEqualityChecks.cs
+++ b/DisCatSharp.ApplicationCommands/Checks/ApplicationCommandEqualityChecks.cs
@@ -24,7 +24,9 @@ internal static class ApplicationCommandEqualityChecks
 	/// <param name="isGuild">Whether the equal check is performed for a guild command.</param>
 	internal static bool IsEqualTo(
 		this DiscordApplicationCommand? ac1,
-		DiscordApplicationCommand? targetApplicationCommand, DiscordClient client, bool isGuild
+		DiscordApplicationCommand? targetApplicationCommand,
+		DiscordClient client,
+		bool isGuild
 	)
 	{
 		if (targetApplicationCommand is null || ac1 is null)
@@ -83,8 +85,12 @@ internal static bool IsEqualTo(
 	/// <param name="localizationEnabled">Whether localization is enabled.</param>
 	/// <param name="guild">Whether the equal check is performed for a guild command.</param>
 	internal static bool SoftEqual(
-		this DiscordApplicationCommand source, DiscordApplicationCommand target,
-		ApplicationCommandType type, BaseDiscordClient client, bool localizationEnabled = false, bool guild = false
+		this DiscordApplicationCommand source,
+		DiscordApplicationCommand target,
+		ApplicationCommandType type,
+		BaseDiscordClient client,
+		bool localizationEnabled = false,
+		bool guild = false
 	)
 	{
 		bool? sDmPerm = source.DmPermission ?? true;
@@ -182,8 +188,12 @@ internal static bool AreDictionariesEqual(this Dictionary<string, string> source
 	/// <param name="sDmPerm">The source dm permission.</param>
 	/// <param name="tDmPerm">The target dm permission.</param>
 	internal static bool DeepEqual(
-		DiscordApplicationCommand source, DiscordApplicationCommand target, BaseDiscordClient client,
-		bool localizationEnabled = false, bool? sDmPerm = null, bool? tDmPerm = null
+		DiscordApplicationCommand source,
+		DiscordApplicationCommand target,
+		BaseDiscordClient client,
+		bool localizationEnabled = false,
+		bool? sDmPerm = null,
+		bool? tDmPerm = null
 	)
 	{
 		var name = source.Name;
@@ -218,13 +228,14 @@ internal static bool DeepEqual(
 	/// <param name="localizationEnabled">Whether localization is enabled.</param>
 	private static (bool Equal, string? Reason) DeepEqualOptions(
 		IReadOnlyList<DiscordApplicationCommandOption>? sourceOptions,
-		IReadOnlyList<DiscordApplicationCommandOption>? targetOptions, bool localizationEnabled
+		IReadOnlyList<DiscordApplicationCommandOption>? targetOptions,
+		bool localizationEnabled
 	)
 	{
 		if (sourceOptions == null && targetOptions == null)
 			return (true, null);
 
-		if ((sourceOptions != null && targetOptions == null) || (sourceOptions == null && targetOptions != null))
+		if (sourceOptions != null && targetOptions == null || sourceOptions == null && targetOptions != null)
 			return (false, "source or target option null, but not both");
 
 		if (sourceOptions!.Count != targetOptions!.Count)
@@ -251,8 +262,8 @@ private static (bool Equal, string? Reason) DeepEqualOptions(
 				              sourceOption.RawDescriptionLocalizations.AreDictionariesEqual(targetOption
 					              .RawDescriptionLocalizations);
 
-			if ((sourceOption.Choices is null && targetOption.Choices is not null) ||
-			    (sourceOption.Choices is not null && targetOption.Choices is null))
+			if (sourceOption.Choices is null && targetOption.Choices is not null ||
+			    sourceOption.Choices is not null && targetOption.Choices is null)
 				return (false, "source or target choices null, but not both - " + sourceOption.Name);
 
 			if (sourceOption.Choices is not null && targetOption.Choices is not null)
@@ -263,10 +274,10 @@ private static (bool Equal, string? Reason) DeepEqualOptions(
 					return (false, "choice mismatch - " + sourceOption.Name);
 			}
 
-			if ((sourceOption.ChannelTypes is null && targetOption.ChannelTypes is not null) ||
-			    (sourceOption.ChannelTypes is not null && targetOption.ChannelTypes is null) ||
-			    (sourceOption.ChannelTypes is not null && targetOption.ChannelTypes is not null &&
-			     !sourceOption.ChannelTypes.OrderBy(x => x).All(targetOption.ChannelTypes.OrderBy(x => x).Contains)))
+			if (sourceOption.ChannelTypes is null && targetOption.ChannelTypes is not null ||
+			    sourceOption.ChannelTypes is not null && targetOption.ChannelTypes is null ||
+			    sourceOption.ChannelTypes is not null && targetOption.ChannelTypes is not null &&
+			    !sourceOption.ChannelTypes.OrderBy(x => x).All(targetOption.ChannelTypes.OrderBy(x => x).Contains))
 				return (false, "channel type mismatch - " + sourceOption.Name);
 
 			var rec = DeepEqualOptions(sourceOption.Options, targetOption.Options, localizationEnabled);
diff --git a/DisCatSharp.ApplicationCommands/Context/BaseContext.cs b/DisCatSharp.ApplicationCommands/Context/BaseContext.cs
index 6ce9af899c..857e0ea149 100644
--- a/DisCatSharp.ApplicationCommands/Context/BaseContext.cs
+++ b/DisCatSharp.ApplicationCommands/Context/BaseContext.cs
@@ -221,5 +221,5 @@ public Task<DiscordMessage> GetFollowupMessageAsync(ulong followupMessageId)
 	/// </summary>
 	/// <returns>The original interaction response.</returns>
 	public Task<DiscordMessage> GetOriginalResponseAsync()
-		 => this.Interaction.GetOriginalResponseAsync();
+		=> this.Interaction.GetOriginalResponseAsync();
 }
diff --git a/DisCatSharp.ApplicationCommands/DisCatSharp.ApplicationCommands.csproj b/DisCatSharp.ApplicationCommands/DisCatSharp.ApplicationCommands.csproj
index 2b807d37a3..379386aada 100644
--- a/DisCatSharp.ApplicationCommands/DisCatSharp.ApplicationCommands.csproj
+++ b/DisCatSharp.ApplicationCommands/DisCatSharp.ApplicationCommands.csproj
@@ -1,44 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../DisCatSharp.Targets/Version.targets" />
-  <Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
-  <Import Project="../DisCatSharp.Targets/Package.targets" />
-  <Import Project="../DisCatSharp.Targets/NuGet.targets" />
-  <Import Project="../DisCatSharp.Targets/Library.targets" />
-  <Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
-
-  <PropertyGroup>
-    <AssemblyName>DisCatSharp.ApplicationCommands</AssemblyName>
-    <RootNamespace>DisCatSharp.ApplicationCommands</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <PackageId>DisCatSharp.ApplicationCommands</PackageId>
-	<Description>
-DisCatSharp Application Commands Extension
-
-Use it on top of your DisCatSharp powered bot and unleash the power of application commands in discord.
-
-Documentation: https://docs.dcs.aitsys.dev/articles/modules/application_commands/intro.html
-	</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Application Commands,Context Menu Commands</PackageTags>
-	<Nullable>annotations</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
-    <PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
-    <ProjectReference Include="..\DisCatSharp.Common\DisCatSharp.Common.csproj" />
-  </ItemGroup>
+	<Import Project="../DisCatSharp.Targets/Version.targets" />
+	<Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
+	<Import Project="../DisCatSharp.Targets/Package.targets" />
+	<Import Project="../DisCatSharp.Targets/NuGet.targets" />
+	<Import Project="../DisCatSharp.Targets/Library.targets" />
+	<Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
+
+	<PropertyGroup>
+		<AssemblyName>DisCatSharp.ApplicationCommands</AssemblyName>
+		<RootNamespace>DisCatSharp.ApplicationCommands</RootNamespace>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<PackageId>DisCatSharp.ApplicationCommands</PackageId>
+		<Description>
+			DisCatSharp Application Commands Extension
+
+			Use it on top of your DisCatSharp powered bot and unleash the power of application commands in discord.
+
+			Documentation: https://docs.dcs.aitsys.dev/articles/modules/application_commands/intro.html
+		</Description>
+		<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Application Commands,Context Menu Commands</PackageTags>
+		<Nullable>annotations</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
+		<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
+		<ProjectReference Include="..\DisCatSharp.Common\DisCatSharp.Common.csproj" />
+	</ItemGroup>
 </Project>
diff --git a/DisCatSharp.ApplicationCommands/Entities/ChoiceTranslator.cs b/DisCatSharp.ApplicationCommands/Entities/ChoiceTranslator.cs
index d1a898aa55..b948b100b6 100644
--- a/DisCatSharp.ApplicationCommands/Entities/ChoiceTranslator.cs
+++ b/DisCatSharp.ApplicationCommands/Entities/ChoiceTranslator.cs
@@ -22,6 +22,7 @@ internal class ChoiceTranslator
 	/// </summary>
 	[JsonProperty("name_translations")]
 	internal Dictionary<string, string> NameTranslationsDictionary { get; set; }
+
 	[JsonIgnore]
 	public DiscordApplicationCommandLocalization NameTranslations
 		=> new(this.NameTranslationsDictionary);
diff --git a/DisCatSharp.ApplicationCommands/Entities/CommandTranslator.cs b/DisCatSharp.ApplicationCommands/Entities/CommandTranslator.cs
index 70efcf9820..7684cc901c 100644
--- a/DisCatSharp.ApplicationCommands/Entities/CommandTranslator.cs
+++ b/DisCatSharp.ApplicationCommands/Entities/CommandTranslator.cs
@@ -36,6 +36,7 @@ internal class CommandTranslator
 	/// </summary>
 	[JsonProperty("name_translations")]
 	internal Dictionary<string, string> NameTranslationDictionary { get; set; }
+
 	[JsonIgnore]
 	public DiscordApplicationCommandLocalization NameTranslations
 		=> new(this.NameTranslationDictionary);
@@ -45,6 +46,7 @@ public DiscordApplicationCommandLocalization NameTranslations
 	/// </summary>
 	[JsonProperty("description_translations")]
 	internal Dictionary<string, string> DescriptionTranslationDictionary { get; set; }
+
 	[JsonIgnore]
 	public DiscordApplicationCommandLocalization DescriptionTranslations
 		=> new(this.DescriptionTranslationDictionary);
diff --git a/DisCatSharp.ApplicationCommands/Entities/CooldownBucket.cs b/DisCatSharp.ApplicationCommands/Entities/CooldownBucket.cs
index 65796d388b..06c915f423 100644
--- a/DisCatSharp.ApplicationCommands/Entities/CooldownBucket.cs
+++ b/DisCatSharp.ApplicationCommands/Entities/CooldownBucket.cs
@@ -101,6 +101,7 @@ internal async Task<bool> DecrementUseAsync()
 			Interlocked.Decrement(ref this.RemainingUsesInternal);
 			success = true;
 		}
+
 		Console.WriteLine($"[DecrementUseAsync]: Remaining: {this.RemainingUses}/{this.MaxUses} Resets: {this.ResetsAt} Now: {DateTimeOffset.UtcNow} Vars[u,c,g]: {this.UserId} {this.ChannelId} {this.GuildId} Id: {this.BucketId}");
 		// ...otherwise just fail
 		this.UsageSemaphore.Release();
@@ -119,7 +120,7 @@ internal async Task<bool> DecrementUseAsync()
 	/// </summary>
 	/// <param name="other"><see cref="CooldownBucket"/> to compare to.</param>
 	/// <returns>Whether the <see cref="CooldownBucket"/> is equal to this <see cref="CooldownBucket"/>.</returns>
-	public bool Equals(CooldownBucket other) => other is not null && (ReferenceEquals(this, other) || (this.UserId == other.UserId && this.ChannelId == other.ChannelId && this.GuildId == other.GuildId));
+	public bool Equals(CooldownBucket other) => other is not null && (ReferenceEquals(this, other) || this.UserId == other.UserId && this.ChannelId == other.ChannelId && this.GuildId == other.GuildId);
 
 	/// <summary>
 	/// Gets the hash code for this <see cref="CooldownBucket"/>.
@@ -138,7 +139,7 @@ internal async Task<bool> DecrementUseAsync()
 		var null1 = bucket1 is null;
 		var null2 = bucket2 is null;
 
-		return (null1 && null2) || (null1 == null2 && null1.Equals(null2));
+		return null1 && null2 || null1 == null2 && null1.Equals(null2);
 	}
 
 	/// <summary>
@@ -159,6 +160,4 @@ internal async Task<bool> DecrementUseAsync()
 	/// <returns>Generated bucket ID.</returns>
 	public static string MakeId(ulong userId = 0, ulong channelId = 0, ulong guildId = 0)
 		=> $"{userId.ToString(CultureInfo.InvariantCulture)}:{channelId.ToString(CultureInfo.InvariantCulture)}:{guildId.ToString(CultureInfo.InvariantCulture)}";
-
-
 }
diff --git a/DisCatSharp.ApplicationCommands/Entities/GroupTranslator.cs b/DisCatSharp.ApplicationCommands/Entities/GroupTranslator.cs
index 4b634ca9d3..617483cbb8 100644
--- a/DisCatSharp.ApplicationCommands/Entities/GroupTranslator.cs
+++ b/DisCatSharp.ApplicationCommands/Entities/GroupTranslator.cs
@@ -36,6 +36,7 @@ internal class GroupTranslator
 	/// </summary>
 	[JsonProperty("name_translations")]
 	internal Dictionary<string, string> NameTranslationsDictionary { get; set; }
+
 	[JsonIgnore]
 	public DiscordApplicationCommandLocalization NameTranslations
 		=> new(this.NameTranslationsDictionary);
@@ -45,6 +46,7 @@ public DiscordApplicationCommandLocalization NameTranslations
 	/// </summary>
 	[JsonProperty("description_translations")]
 	internal Dictionary<string, string> DescriptionTranslationsDictionary { get; set; }
+
 	[JsonIgnore]
 	public DiscordApplicationCommandLocalization DescriptionTranslations
 		=> new(this.DescriptionTranslationsDictionary);
diff --git a/DisCatSharp.ApplicationCommands/Entities/OptionTranslator.cs b/DisCatSharp.ApplicationCommands/Entities/OptionTranslator.cs
index 67f1cb39dd..907824724d 100644
--- a/DisCatSharp.ApplicationCommands/Entities/OptionTranslator.cs
+++ b/DisCatSharp.ApplicationCommands/Entities/OptionTranslator.cs
@@ -28,6 +28,7 @@ internal class OptionTranslator
 	/// </summary>
 	[JsonProperty("name_translations")]
 	internal Dictionary<string, string> NameTranslationsDictionary { get; set; }
+
 	[JsonIgnore]
 	public DiscordApplicationCommandLocalization NameTranslations
 		=> new(this.NameTranslationsDictionary);
@@ -37,6 +38,7 @@ public DiscordApplicationCommandLocalization NameTranslations
 	/// </summary>
 	[JsonProperty("description_translations")]
 	internal Dictionary<string, string> DescriptionTranslationsDictionary { get; set; }
+
 	[JsonIgnore]
 	public DiscordApplicationCommandLocalization DescriptionTranslations
 		=> new(this.DescriptionTranslationsDictionary);
diff --git a/DisCatSharp.ApplicationCommands/Entities/RegisteredDiscordApplicationCommand.cs b/DisCatSharp.ApplicationCommands/Entities/RegisteredDiscordApplicationCommand.cs
index 17091f5a9f..e8df2effb9 100644
--- a/DisCatSharp.ApplicationCommands/Entities/RegisteredDiscordApplicationCommand.cs
+++ b/DisCatSharp.ApplicationCommands/Entities/RegisteredDiscordApplicationCommand.cs
@@ -43,8 +43,6 @@ internal RegisteredDiscordApplicationCommand(DiscordApplicationCommand parent)
 		this.UnknownProperties = parent.UnknownProperties;
 		this.Version = parent.Version;
 
-
-
 		try
 		{
 			if (ApplicationCommandsExtension.CommandMethods.Any(x => x.CommandId == this.Id))
@@ -78,14 +76,12 @@ internal RegisteredDiscordApplicationCommand(DiscordApplicationCommand parent)
 	/// </summary>
 	public MethodInfo? CommandMethod { get; internal set; }
 
-
 	/// <summary>
 	/// The type that contains the sub commands of this command.
 	/// <see langword="null"/> if command is not a group command or reflection failed.
 	/// </summary>
 	public Type? CommandType { get; internal set; }
 
-
 	/// <summary>
 	/// The type this command is contained in.
 	/// <see langword="null"/> if reflection failed.
diff --git a/DisCatSharp.ApplicationCommands/Entities/SubGroupTranslator.cs b/DisCatSharp.ApplicationCommands/Entities/SubGroupTranslator.cs
index c8a0217827..cdf445713b 100644
--- a/DisCatSharp.ApplicationCommands/Entities/SubGroupTranslator.cs
+++ b/DisCatSharp.ApplicationCommands/Entities/SubGroupTranslator.cs
@@ -28,6 +28,7 @@ internal class SubGroupTranslator
 	/// </summary>
 	[JsonProperty("name_translations")]
 	internal Dictionary<string, string> NameTranslationsDictionary { get; set; }
+
 	[JsonIgnore]
 	public DiscordApplicationCommandLocalization NameTranslations
 		=> new(this.NameTranslationsDictionary);
@@ -37,6 +38,7 @@ public DiscordApplicationCommandLocalization NameTranslations
 	/// </summary>
 	[JsonProperty("description_translations")]
 	internal Dictionary<string, string> DescriptionTranslationsDictionary { get; set; }
+
 	[JsonIgnore]
 	public DiscordApplicationCommandLocalization DescriptionTranslations
 		=> new(this.DescriptionTranslationsDictionary);
diff --git a/DisCatSharp.ApplicationCommands/Enums/ApplicationCommandFinalType.cs b/DisCatSharp.ApplicationCommands/Enums/ApplicationCommandFinalType.cs
index 7d74f50bea..d7ddaef748 100644
--- a/DisCatSharp.ApplicationCommands/Enums/ApplicationCommandFinalType.cs
+++ b/DisCatSharp.ApplicationCommands/Enums/ApplicationCommandFinalType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.ApplicationCommands.Enums;
 
 internal enum ApplicationCommandFinalType
diff --git a/DisCatSharp.ApplicationCommands/Enums/ApplicationCommandModuleLifespan.cs b/DisCatSharp.ApplicationCommands/Enums/ApplicationCommandModuleLifespan.cs
index 8120f80099..b00d3f4628 100644
--- a/DisCatSharp.ApplicationCommands/Enums/ApplicationCommandModuleLifespan.cs
+++ b/DisCatSharp.ApplicationCommands/Enums/ApplicationCommandModuleLifespan.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.ApplicationCommands.Enums;
 
 /// <summary>
diff --git a/DisCatSharp.ApplicationCommands/Enums/CooldownBucketType.cs b/DisCatSharp.ApplicationCommands/Enums/CooldownBucketType.cs
index 38956db7ca..fb0a269dd4 100644
--- a/DisCatSharp.ApplicationCommands/Enums/CooldownBucketType.cs
+++ b/DisCatSharp.ApplicationCommands/Enums/CooldownBucketType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.ApplicationCommands.Enums;
 
 /// <summary>
@@ -6,7 +5,6 @@ namespace DisCatSharp.ApplicationCommands.Enums;
 /// </summary>
 public enum CooldownBucketType : int
 {
-
 	/// <summary>
 	/// Denotes that the command will have its cooldown applied globally.
 	/// </summary>
diff --git a/DisCatSharp.ApplicationCommands/ExtensionMethods.cs b/DisCatSharp.ApplicationCommands/ExtensionMethods.cs
index 64a9718007..f78720d5e9 100644
--- a/DisCatSharp.ApplicationCommands/ExtensionMethods.cs
+++ b/DisCatSharp.ApplicationCommands/ExtensionMethods.cs
@@ -20,8 +20,10 @@ public static class ExtensionMethods
 	/// <param name="client">Client to enable application commands for.</param>
 	/// <param name="config">Configuration to use.</param>
 	/// <returns>Created <see cref="ApplicationCommandsExtension"/>.</returns>
-	public static ApplicationCommandsExtension UseApplicationCommands(this DiscordClient client,
-		ApplicationCommandsConfiguration config = null)
+	public static ApplicationCommandsExtension UseApplicationCommands(
+		this DiscordClient client,
+		ApplicationCommandsConfiguration config = null
+	)
 	{
 		if (client.GetExtension<ApplicationCommandsExtension>() != null)
 			throw new InvalidOperationException("Application commands are already enabled for that client.");
@@ -75,6 +77,7 @@ public static void RegisterGlobalCommands(this IReadOnlyDictionary<int, Applicat
 	{
 		if (!typeof(ApplicationCommandsModule).IsAssignableFrom(type))
 			throw new ArgumentException("Command classes have to inherit from ApplicationCommandsModule", nameof(type));
+
 		foreach (var extension in extensions.Values)
 			extension.RegisterGlobalCommands(type, translationSetup);
 	}
@@ -90,7 +93,6 @@ public static void RegisterGuildCommands<T>(this IReadOnlyDictionary<int, Applic
 	{
 		foreach (var extension in extensions.Values)
 			extension.RegisterGuildCommands<T>(guildId, translationSetup);
-
 	}
 
 	/// <summary>
@@ -104,6 +106,7 @@ public static void RegisterGuildCommands(this IReadOnlyDictionary<int, Applicati
 	{
 		if (!typeof(ApplicationCommandsModule).IsAssignableFrom(type))
 			throw new ArgumentException("Command classes have to inherit from ApplicationCommandsModule", nameof(type));
+
 		foreach (var extension in extensions.Values)
 			extension.RegisterGuildCommands(type, guildId, translationSetup);
 	}
@@ -141,17 +144,18 @@ public static string GetName<T>(this T e) where T : IConvertible
 			var values = Enum.GetValues(type);
 
 			foreach (int val in values)
-			{
 				if (val == e.ToInt32(CultureInfo.InvariantCulture))
 				{
 					var memInfo = type.GetMember(type.GetEnumName(val));
 
 					return memInfo[0]
 						.GetCustomAttributes(typeof(ChoiceNameAttribute), false)
-						.FirstOrDefault() is ChoiceNameAttribute nameAttribute ? nameAttribute.Name : type.GetEnumName(val);
+						.FirstOrDefault() is ChoiceNameAttribute nameAttribute
+						? nameAttribute.Name
+						: type.GetEnumName(val);
 				}
-			}
 		}
+
 		return null;
 	}
 }
diff --git a/DisCatSharp.ApplicationCommands/Workers/ApplicationCommandWorker.cs b/DisCatSharp.ApplicationCommands/Workers/ApplicationCommandWorker.cs
index 3094fdd3b9..439f129016 100644
--- a/DisCatSharp.ApplicationCommands/Workers/ApplicationCommandWorker.cs
+++ b/DisCatSharp.ApplicationCommands/Workers/ApplicationCommandWorker.cs
@@ -27,18 +27,17 @@ internal class CommandWorker
 	/// <returns>Too much.</returns>
 	internal static Task<
 		(
-			List<DiscordApplicationCommand> applicationCommands,
-			List<KeyValuePair<Type, Type>> commandTypeSources,
-			List<ContextMenuCommand> contextMenuCommands,
-			bool withLocalization
+		List<DiscordApplicationCommand> applicationCommands,
+		List<KeyValuePair<Type, Type>> commandTypeSources,
+		List<ContextMenuCommand> contextMenuCommands,
+		bool withLocalization
 		)
-		> ParseContextMenuCommands(Type type, IEnumerable<MethodInfo> methods, List<CommandTranslator> translator = null)
+	> ParseContextMenuCommands(Type type, IEnumerable<MethodInfo> methods, List<CommandTranslator> translator = null)
 	{
 		List<DiscordApplicationCommand> commands = new();
 		List<KeyValuePair<Type, Type>> commandTypeSources = new();
 		List<ContextMenuCommand> contextMenuCommands = new();
 
-
 		foreach (var contextMethod in methods)
 		{
 			var contextAttribute = contextMethod.GetCustomAttribute<ContextMenuAttribute>();
@@ -49,7 +48,7 @@ bool withLocalization
 			if (commandTranslation != null)
 				nameLocalizations = commandTranslation.NameTranslations;
 
-			var command = new DiscordApplicationCommand(contextAttribute.Name, null, null, contextAttribute.Type, nameLocalizations, null, contextAttribute.DefaultMemberPermissions, contextAttribute.DmPermission ?? true, isNsfw: contextAttribute.IsNsfw, allowedContexts: contextAttribute.AllowedContexts, integrationTypes: contextAttribute.IntegrationTypes);
+			var command = new DiscordApplicationCommand(contextAttribute.Name, null, null, contextAttribute.Type, nameLocalizations, null, contextAttribute.DefaultMemberPermissions, contextAttribute.DmPermission ?? true, contextAttribute.IsNsfw, contextAttribute.AllowedContexts, contextAttribute.IntegrationTypes);
 
 			var parameters = contextMethod.GetParameters();
 			if (parameters.Length == 0 || parameters == null || !ReferenceEquals(parameters.FirstOrDefault()?.ParameterType, typeof(ContextMenuContext)))
@@ -57,10 +56,13 @@ bool withLocalization
 			if (parameters.Length > 1)
 				throw new ArgumentException($"The context menu command '{contextAttribute.Name}' cannot have parameters!");
 
-			contextMenuCommands.Add(new ContextMenuCommand { Method = contextMethod, Name = contextAttribute.Name });
+			contextMenuCommands.Add(new()
+			{
+				Method = contextMethod, Name = contextAttribute.Name
+			});
 
 			commands.Add(command);
-			commandTypeSources.Add(new KeyValuePair<Type, Type>(type, type));
+			commandTypeSources.Add(new(type, type));
 		}
 
 		return Task.FromResult((commands, commandTypeSources, contextMenuCommands, translator != null));
@@ -76,19 +78,18 @@ bool withLocalization
 	/// <returns>Too much.</returns>
 	internal static async Task<
 		(
-			List<DiscordApplicationCommand> applicationCommands,
-			List<KeyValuePair<Type, Type>> commandTypeSources,
-			List<CommandMethod> commandMethods,
-			bool withLocalization
+		List<DiscordApplicationCommand> applicationCommands,
+		List<KeyValuePair<Type, Type>> commandTypeSources,
+		List<CommandMethod> commandMethods,
+		bool withLocalization
 		)
-		> ParseBasicSlashCommandsAsync(Type type, IEnumerable<MethodInfo> methods, ulong? guildId = null, List<CommandTranslator> translator = null)
+	> ParseBasicSlashCommandsAsync(Type type, IEnumerable<MethodInfo> methods, ulong? guildId = null, List<CommandTranslator> translator = null)
 	{
 		List<DiscordApplicationCommand> commands = new();
 		List<KeyValuePair<Type, Type>> commandTypeSources = new();
 		List<CommandMethod> commandMethods = new();
 
 		foreach (var method in methods)
-		{
 			try
 			{
 				var commandAttribute = method.GetCustomAttribute<SlashCommandAttribute>();
@@ -96,9 +97,13 @@ bool withLocalization
 				var parameters = method.GetParameters();
 				if (parameters.Length == 0 || parameters == null || !ReferenceEquals(parameters.FirstOrDefault()?.ParameterType, typeof(InteractionContext)))
 					throw new ArgumentException($"The first argument of the command '{commandAttribute.Name}' has to be an InteractionContext!");
+
 				var options = await ApplicationCommandsExtension.ParseParametersAsync(parameters.Skip(1), commandAttribute.Name, guildId).ConfigureAwait(false);
 
-				commandMethods.Add(new CommandMethod { Method = method, Name = commandAttribute.Name });
+				commandMethods.Add(new()
+				{
+					Method = method, Name = commandAttribute.Name
+				});
 
 				DiscordApplicationCommandLocalization nameLocalizations = null;
 				DiscordApplicationCommandLocalization descriptionLocalizations = null;
@@ -108,9 +113,8 @@ bool withLocalization
 
 				if (commandTranslation != null && commandTranslation.Options != null)
 				{
-					localizedOptions = new List<DiscordApplicationCommandOption>(options.Count);
+					localizedOptions = new(options.Count);
 					foreach (var option in options)
-					{
 						try
 						{
 							var choices = option.Choices != null ? new List<DiscordApplicationCommandOptionChoice>(option.Choices.Count) : null;
@@ -118,14 +122,14 @@ bool withLocalization
 								foreach (var choice in option.Choices)
 									try
 									{
-										choices.Add(new DiscordApplicationCommandOptionChoice(choice.Name, choice.Value, commandTranslation.Options.Single(o => o.Name == option.Name).Choices.Single(c => c.Name == choice.Name).NameTranslations));
+										choices.Add(new(choice.Name, choice.Value, commandTranslation.Options.Single(o => o.Name == option.Name).Choices.Single(c => c.Name == choice.Name).NameTranslations));
 									}
 									catch (Exception ex)
 									{
 										throw new AggregateException($"Failed to register choice '{choice.Name}' in command '{commandAttribute.Name}'", ex);
 									}
 
-							localizedOptions.Add(new DiscordApplicationCommandOption(option.Name, option.Description, option.Type, option.Required,
+							localizedOptions.Add(new(option.Name, option.Description, option.Type, option.Required,
 								choices, option.Options, option.ChannelTypes, option.AutoComplete, option.MinimumValue, option.MaximumValue,
 								commandTranslation.Options.Single(o => o.Name == option.Name).NameTranslations, commandTranslation.Options.Single(o => o.Name == option.Name).DescriptionTranslations,
 								option.MinimumLength, option.MaximumLength
@@ -135,21 +139,20 @@ bool withLocalization
 						{
 							throw new AggregateException($"Failed to register option '{option.Name}' in command '{commandAttribute.Name}'", ex);
 						}
-					}
 
 					nameLocalizations = commandTranslation.NameTranslations;
 					descriptionLocalizations = commandTranslation.DescriptionTranslations;
 				}
 
-				var payload = new DiscordApplicationCommand(commandAttribute.Name, commandAttribute.Description, (localizedOptions != null && localizedOptions.Any() ? localizedOptions : null) ?? (options != null && options.Any() ? options : null), ApplicationCommandType.ChatInput, nameLocalizations, descriptionLocalizations, commandAttribute.DefaultMemberPermissions, commandAttribute.DmPermission ?? true, isNsfw: commandAttribute.IsNsfw, allowedContexts: commandAttribute.AllowedContexts, integrationTypes: commandAttribute.IntegrationTypes);
+				var payload = new DiscordApplicationCommand(commandAttribute.Name, commandAttribute.Description, (localizedOptions != null && localizedOptions.Any() ? localizedOptions : null) ?? (options != null && options.Any() ? options : null), ApplicationCommandType.ChatInput, nameLocalizations, descriptionLocalizations, commandAttribute.DefaultMemberPermissions, commandAttribute.DmPermission ?? true,
+					commandAttribute.IsNsfw, commandAttribute.AllowedContexts, commandAttribute.IntegrationTypes);
 				commands.Add(payload);
-				commandTypeSources.Add(new KeyValuePair<Type, Type>(type, type));
+				commandTypeSources.Add(new(type, type));
 			}
 			catch (Exception ex)
 			{
 				throw new AggregateException($"Failed to register command with method name '{method.Name}'", ex);
 			}
-		}
 
 		return (commands, commandTypeSources, commandMethods, translator != null);
 	}
@@ -170,14 +173,14 @@ internal class NestedCommandWorker
 	/// <returns>Too much.</returns>
 	internal static async Task<
 		(
-			List<DiscordApplicationCommand> applicationCommands,
-			List<KeyValuePair<Type, Type>> commandTypeSources,
-			List<object> singletonModules,
-			List<GroupCommand> groupCommands,
-			List<SubGroupCommand> subGroupCommands,
-			bool withLocalization
+		List<DiscordApplicationCommand> applicationCommands,
+		List<KeyValuePair<Type, Type>> commandTypeSources,
+		List<object> singletonModules,
+		List<GroupCommand> groupCommands,
+		List<SubGroupCommand> subGroupCommands,
+		bool withLocalization
 		)
-		> ParseSlashGroupsAsync(Type type, List<TypeInfo> types, ulong? guildId = null, List<GroupTranslator> translator = null)
+	> ParseSlashGroupsAsync(Type type, List<TypeInfo> types, ulong? guildId = null, List<GroupTranslator> translator = null)
 	{
 		List<DiscordApplicationCommand> commands = new();
 		List<KeyValuePair<Type, Type>> commandTypeSources = new();
@@ -207,7 +210,8 @@ bool withLocalization
 			}
 
 			//Initializes the command
-			var payload = new DiscordApplicationCommand(groupAttribute.Name, groupAttribute.Description, nameLocalizations: nameLocalizations, descriptionLocalizations: descriptionLocalizations, defaultMemberPermissions: groupAttribute.DefaultMemberPermissions, dmPermission: groupAttribute.DmPermission ?? true, isNsfw: groupAttribute.IsNsfw, allowedContexts: groupAttribute.AllowedContexts, integrationTypes: groupAttribute.IntegrationTypes);
+			var payload = new DiscordApplicationCommand(groupAttribute.Name, groupAttribute.Description, nameLocalizations: nameLocalizations, descriptionLocalizations: descriptionLocalizations, defaultMemberPermissions: groupAttribute.DefaultMemberPermissions, dmPermission: groupAttribute.DmPermission ?? true, isNsfw: groupAttribute.IsNsfw, allowedContexts: groupAttribute.AllowedContexts,
+				integrationTypes: groupAttribute.IntegrationTypes);
 			commandTypeSources.Add(new(type, type));
 
 			var commandMethods = new List<KeyValuePair<string, MethodInfo>>();
@@ -231,19 +235,18 @@ bool withLocalization
 
 				if (commandTranslation?.Commands != null)
 				{
-
 					var subCommandTranslation = commandTranslation.Commands.Single(sc => sc.Name == commandAttribute.Name);
 					if (subCommandTranslation.Options != null)
 					{
-						localizedOptions = new List<DiscordApplicationCommandOption>(options.Count);
+						localizedOptions = new(options.Count);
 						foreach (var option in options)
 						{
 							var choices = option.Choices != null ? new List<DiscordApplicationCommandOptionChoice>(option.Choices.Count) : null;
 							if (option.Choices != null)
 								foreach (var choice in option.Choices)
-									choices.Add(new DiscordApplicationCommandOptionChoice(choice.Name, choice.Value, subCommandTranslation.Options.Single(o => o.Name == option.Name).Choices.Single(c => c.Name == choice.Name).NameTranslations));
+									choices.Add(new(choice.Name, choice.Value, subCommandTranslation.Options.Single(o => o.Name == option.Name).Choices.Single(c => c.Name == choice.Name).NameTranslations));
 
-							localizedOptions.Add(new DiscordApplicationCommandOption(option.Name, option.Description, option.Type, option.Required,
+							localizedOptions.Add(new(option.Name, option.Description, option.Type, option.Required,
 								choices, option.Options, option.ChannelTypes, option.AutoComplete, option.MinimumValue, option.MaximumValue,
 								subCommandTranslation.Options.Single(o => o.Name == option.Name).NameTranslations, subCommandTranslation.Options.Single(o => o.Name == option.Name).DescriptionTranslations,
 								option.MinimumLength, option.MaximumLength
@@ -255,18 +258,26 @@ bool withLocalization
 					subDescriptionLocalizations = subCommandTranslation.DescriptionTranslations;
 				}
 
-
 				//Creates the subcommand and adds it to the main command
 				var subpayload = new DiscordApplicationCommandOption(commandAttribute.Name, commandAttribute.Description, ApplicationCommandOptionType.SubCommand, false, null, localizedOptions ?? options, nameLocalizations: subNameLocalizations, descriptionLocalizations: subDescriptionLocalizations);
-				payload = new(payload.Name, payload.Description, payload.Options?.Append(subpayload) ?? new[] { subpayload }, nameLocalizations: payload.NameLocalizations, descriptionLocalizations: payload.DescriptionLocalizations, defaultMemberPermissions: payload.DefaultMemberPermissions, dmPermission: payload.DmPermission ?? true, isNsfw: payload.IsNsfw, allowedContexts: payload.AllowedContexts, integrationTypes: payload.IntegrationTypes);
+				payload = new(payload.Name, payload.Description, payload.Options?.Append(subpayload) ?? new[]
+				{
+					subpayload
+				}, nameLocalizations: payload.NameLocalizations, descriptionLocalizations: payload.DescriptionLocalizations, defaultMemberPermissions: payload.DefaultMemberPermissions, dmPermission: payload.DmPermission ?? true, isNsfw: payload.IsNsfw, allowedContexts: payload.AllowedContexts, integrationTypes: payload.IntegrationTypes);
 				commandTypeSources.Add(new(subclassInfo, type));
 
 				//Adds it to the method lists
-				commandMethods.Add(new KeyValuePair<string, MethodInfo>(commandAttribute.Name, submethod));
-				groupCommands.Add(new GroupCommand { Name = groupAttribute.Name, Methods = commandMethods });
+				commandMethods.Add(new(commandAttribute.Name, submethod));
+				groupCommands.Add(new()
+				{
+					Name = groupAttribute.Name, Methods = commandMethods
+				});
 			}
 
-			var command = new SubGroupCommand { Name = groupAttribute.Name };
+			var command = new SubGroupCommand
+			{
+				Name = groupAttribute.Name
+			};
 			//Handles subgroups
 			foreach (var subclass in subclasses)
 			{
@@ -277,7 +288,6 @@ bool withLocalization
 
 				var currentMethods = new List<KeyValuePair<string, MethodInfo>>();
 
-
 				DiscordApplicationCommandLocalization subNameLocalizations = null;
 				DiscordApplicationCommandLocalization subDescriptionLocalizations = null;
 
@@ -286,7 +296,6 @@ bool withLocalization
 					var commandTranslation = translator.Single(c => c.Name == payload.Name);
 					if (commandTranslation != null && commandTranslation.SubGroups != null)
 					{
-
 						var subCommandTranslation = commandTranslation.SubGroups.Single(sc => sc.Name == subgroupAttribute.Name);
 
 						if (subCommandTranslation != null)
@@ -320,15 +329,15 @@ bool withLocalization
 
 					if (subSubCommandTranslation != null && subSubCommandTranslation.Options != null)
 					{
-						localizedOptions = new List<DiscordApplicationCommandOption>(suboptions.Count);
+						localizedOptions = new(suboptions.Count);
 						foreach (var option in suboptions)
 						{
 							var choices = option.Choices != null ? new List<DiscordApplicationCommandOptionChoice>(option.Choices.Count) : null;
 							if (option.Choices != null)
 								foreach (var choice in option.Choices)
-									choices.Add(new DiscordApplicationCommandOptionChoice(choice.Name, choice.Value, subSubCommandTranslation.Options.Single(o => o.Name == option.Name).Choices.Single(c => c.Name == choice.Name).NameTranslations));
+									choices.Add(new(choice.Name, choice.Value, subSubCommandTranslation.Options.Single(o => o.Name == option.Name).Choices.Single(c => c.Name == choice.Name).NameTranslations));
 
-							localizedOptions.Add(new DiscordApplicationCommandOption(option.Name, option.Description, option.Type, option.Required,
+							localizedOptions.Add(new(option.Name, option.Description, option.Type, option.Required,
 								choices, option.Options, option.ChannelTypes, option.AutoComplete, option.MinimumValue, option.MaximumValue,
 								subSubCommandTranslation.Options.Single(o => o.Name == option.Name).NameTranslations, subSubCommandTranslation.Options.Single(o => o.Name == option.Name).DescriptionTranslations,
 								option.MinimumLength, option.MaximumLength
@@ -341,20 +350,27 @@ bool withLocalization
 
 					var subsubpayload = new DiscordApplicationCommandOption(commatt.Name, commatt.Description, ApplicationCommandOptionType.SubCommand, false, null, (localizedOptions != null && localizedOptions.Any() ? localizedOptions : null) ?? (suboptions != null && suboptions.Any() ? suboptions : null), nameLocalizations: subSubNameLocalizations, descriptionLocalizations: subSubDescriptionLocalizations);
 					options.Add(subsubpayload);
-					commandMethods.Add(new KeyValuePair<string, MethodInfo>(commatt.Name, subsubmethod));
-					currentMethods.Add(new KeyValuePair<string, MethodInfo>(commatt.Name, subsubmethod));
+					commandMethods.Add(new(commatt.Name, subsubmethod));
+					currentMethods.Add(new(commatt.Name, subsubmethod));
 				}
 
 				//Adds the group to the command and method lists
 				var subpayload = new DiscordApplicationCommandOption(subgroupAttribute.Name, subgroupAttribute.Description, ApplicationCommandOptionType.SubCommandGroup, false, null, options, nameLocalizations: subNameLocalizations, descriptionLocalizations: subDescriptionLocalizations);
-				command.SubCommands.Add(new() { Name = subgroupAttribute.Name, Methods = currentMethods });
-				payload = new(payload.Name, payload.Description, payload.Options?.Append(subpayload) ?? new[] { subpayload }, nameLocalizations: payload.NameLocalizations, descriptionLocalizations: payload.DescriptionLocalizations, defaultMemberPermissions: payload.DefaultMemberPermissions, dmPermission: payload.DmPermission ?? true, isNsfw: payload.IsNsfw, allowedContexts: payload.AllowedContexts, integrationTypes: payload.IntegrationTypes);
+				command.SubCommands.Add(new()
+				{
+					Name = subgroupAttribute.Name, Methods = currentMethods
+				});
+				payload = new(payload.Name, payload.Description, payload.Options?.Append(subpayload) ?? new[]
+				{
+					subpayload
+				}, nameLocalizations: payload.NameLocalizations, descriptionLocalizations: payload.DescriptionLocalizations, defaultMemberPermissions: payload.DefaultMemberPermissions, dmPermission: payload.DmPermission ?? true, isNsfw: payload.IsNsfw, allowedContexts: payload.AllowedContexts, integrationTypes: payload.IntegrationTypes);
 				commandTypeSources.Add(new(subclass, type));
 
 				//Accounts for lifespans for the sub group
 				if (subclass.GetCustomAttribute<ApplicationCommandModuleLifespanAttribute>() != null && subclass.GetCustomAttribute<ApplicationCommandModuleLifespanAttribute>().Lifespan == ApplicationCommandModuleLifespan.Singleton)
 					singletonModules.Add(ApplicationCommandsExtension.CreateInstance(subclass, ApplicationCommandsExtension.Configuration?.ServiceProvider));
 			}
+
 			if (command.SubCommands.Any()) subGroupCommands.Add(command);
 			commands.Add(payload);
 
diff --git a/DisCatSharp.ApplicationCommands/Workers/RegistrationWorker.cs b/DisCatSharp.ApplicationCommands/Workers/RegistrationWorker.cs
index 5929735fe7..1c1b390225 100644
--- a/DisCatSharp.ApplicationCommands/Workers/RegistrationWorker.cs
+++ b/DisCatSharp.ApplicationCommands/Workers/RegistrationWorker.cs
@@ -47,7 +47,7 @@ internal static async Task<List<DiscordApplicationCommand>> RegisterGlobalComman
 					action.NameLocalizations = command.NameLocalizations;
 					action.Description = command.Description;
 					action.DescriptionLocalizations = command.DescriptionLocalizations;
-					if(command.Options != null && command.Options.Any())
+					if (command.Options != null && command.Options.Any())
 						action.Options = Optional.Some(command.Options);
 					action.DefaultMemberPermissions = command.DefaultMemberPermissions;
 					action.DmPermission = command.DmPermission ?? true;
@@ -80,12 +80,12 @@ internal static async Task<List<DiscordApplicationCommand>> RegisterGlobalComman
 						action.NameLocalizations = command.NameLocalizations;
 						action.Description = command.Description;
 						action.DescriptionLocalizations = command.DescriptionLocalizations;
-						if(command.Options != null && command.Options.Any())
+						if (command.Options != null && command.Options.Any())
 							action.Options = Optional.Some(command.Options);
 						action.DefaultMemberPermissions = command.DefaultMemberPermissions;
 						action.DmPermission = command.DmPermission ?? true;
 						action.IsNsfw = command.IsNsfw;
-					action.AllowedContexts = command.AllowedContexts;
+						action.AllowedContexts = command.AllowedContexts;
 					}).ConfigureAwait(false);
 
 					commands.Add(discordBackendCommand);
@@ -107,7 +107,7 @@ internal static async Task<List<DiscordApplicationCommand>> RegisterGlobalComman
 					action.NameLocalizations = command.NameLocalizations;
 					action.Description = command.Description;
 					action.DescriptionLocalizations = command.DescriptionLocalizations;
-					if(command.Options != null && command.Options.Any())
+					if (command.Options != null && command.Options.Any())
 						action.Options = Optional.Some(command.Options);
 					action.DefaultMemberPermissions = command.DefaultMemberPermissions;
 					action.DmPermission = command.DmPermission ?? true;
@@ -131,6 +131,7 @@ internal static async Task<List<DiscordApplicationCommand>> RegisterGlobalComman
 				cmd.Id = overwrite.Key;
 				overwriteList.Add(cmd);
 			}
+
 			var discordBackendCommands = await client.BulkOverwriteGlobalApplicationCommandsAsync(overwriteList).ConfigureAwait(false);
 			commands.AddRange(discordBackendCommands);
 		}
@@ -198,7 +199,7 @@ internal static async Task<List<DiscordApplicationCommand>> RegisterGuildCommand
 					action.NameLocalizations = command.NameLocalizations;
 					action.Description = command.Description;
 					action.DescriptionLocalizations = command.DescriptionLocalizations;
-					if(command.Options != null && command.Options.Any())
+					if (command.Options != null && command.Options.Any())
 						action.Options = Optional.Some(command.Options);
 					action.DefaultMemberPermissions = command.DefaultMemberPermissions;
 					action.DmPermission = command.DmPermission ?? true;
@@ -231,7 +232,7 @@ internal static async Task<List<DiscordApplicationCommand>> RegisterGuildCommand
 						action.NameLocalizations = command.NameLocalizations;
 						action.Description = command.Description;
 						action.DescriptionLocalizations = command.DescriptionLocalizations;
-						if(command.Options != null && command.Options.Any())
+						if (command.Options != null && command.Options.Any())
 							action.Options = Optional.Some(command.Options);
 						action.DefaultMemberPermissions = command.DefaultMemberPermissions;
 						action.DmPermission = command.DmPermission ?? true;
@@ -258,7 +259,7 @@ internal static async Task<List<DiscordApplicationCommand>> RegisterGuildCommand
 					action.NameLocalizations = command.NameLocalizations;
 					action.Description = command.Description;
 					action.DescriptionLocalizations = command.DescriptionLocalizations;
-					if(command.Options != null && command.Options.Any())
+					if (command.Options != null && command.Options.Any())
 						action.Options = Optional.Some(command.Options);
 					if (command.DefaultMemberPermissions.HasValue)
 						action.DefaultMemberPermissions = command.DefaultMemberPermissions.Value;
@@ -284,6 +285,7 @@ internal static async Task<List<DiscordApplicationCommand>> RegisterGuildCommand
 				cmd.Id = overwrite.Key;
 				overwriteList.Add(cmd);
 			}
+
 			var discordBackendCommands = await client.BulkOverwriteGuildApplicationCommandsAsync(guildId, overwriteList).ConfigureAwait(false);
 			commands.AddRange(discordBackendCommands);
 		}
@@ -327,9 +329,8 @@ internal static async Task<List<DiscordApplicationCommand>> RegisterGuildCommand
 	/// <returns>A list of command ids.</returns>
 	private static List<ulong> BuildGuildDeleteList(DiscordClient client, ulong guildId, List<DiscordApplicationCommand> updateList)
 	{
-
 		if (ApplicationCommandsExtension.GuildDiscordCommands == null || !ApplicationCommandsExtension.GuildDiscordCommands.Any()
-			|| !ApplicationCommandsExtension.GuildDiscordCommands.TryGetFirstValueByKey(guildId, out var discord)
+		                                                              || !ApplicationCommandsExtension.GuildDiscordCommands.TryGetFirstValueByKey(guildId, out var discord)
 		)
 			return null;
 
@@ -358,9 +359,8 @@ private static List<ulong> BuildGuildDeleteList(DiscordClient client, ulong guil
 	/// <returns></returns>
 	private static List<DiscordApplicationCommand> BuildGuildCreateList(DiscordClient client, ulong guildId, List<DiscordApplicationCommand> updateList)
 	{
-
 		if (ApplicationCommandsExtension.GuildDiscordCommands == null || !ApplicationCommandsExtension.GuildDiscordCommands.Any()
-			|| updateList == null || !ApplicationCommandsExtension.GuildDiscordCommands.TryGetFirstValueByKey(guildId, out var discord)
+		                                                              || updateList == null || !ApplicationCommandsExtension.GuildDiscordCommands.TryGetFirstValueByKey(guildId, out var discord)
 		)
 			return updateList;
 
@@ -384,14 +384,13 @@ private static List<DiscordApplicationCommand> BuildGuildCreateList(DiscordClien
 	/// <param name="updateList">The command list.</param>
 	/// <returns>A dictionary of command id and command.</returns>
 	private static (
-			Dictionary<ulong, DiscordApplicationCommand> changedCommands,
-			List<DiscordApplicationCommand> unchangedCommands
+		Dictionary<ulong, DiscordApplicationCommand> changedCommands,
+		List<DiscordApplicationCommand> unchangedCommands
 		) BuildGuildOverwriteList(DiscordClient client, ulong guildId, List<DiscordApplicationCommand> updateList)
 	{
-
 		if (ApplicationCommandsExtension.GuildDiscordCommands == null || !ApplicationCommandsExtension.GuildDiscordCommands.Any()
-			|| ApplicationCommandsExtension.GuildDiscordCommands.All(l => l.Key != guildId) || updateList == null
-			|| !ApplicationCommandsExtension.GuildDiscordCommands.TryGetFirstValueByKey(guildId, out var discord)
+		                                                              || ApplicationCommandsExtension.GuildDiscordCommands.All(l => l.Key != guildId) || updateList == null
+		                                                              || !ApplicationCommandsExtension.GuildDiscordCommands.TryGetFirstValueByKey(guildId, out var discord)
 		)
 			return (null, null);
 
@@ -483,8 +482,8 @@ private static List<DiscordApplicationCommand> BuildGlobalCreateList(DiscordClie
 	/// <param name="updateList">The command list.</param>
 	/// <returns>A dictionary of command ids and commands.</returns>
 	private static (
-			Dictionary<ulong, DiscordApplicationCommand> changedCommands,
-			List<DiscordApplicationCommand> unchangedCommands
+		Dictionary<ulong, DiscordApplicationCommand> changedCommands,
+		List<DiscordApplicationCommand> unchangedCommands
 		) BuildGlobalOverwriteList(DiscordClient client, List<DiscordApplicationCommand> updateList)
 	{
 		if (ApplicationCommandsExtension.GlobalDiscordCommands == null || !ApplicationCommandsExtension.GlobalDiscordCommands.Any() || updateList == null)
diff --git a/DisCatSharp.CommandsNext/Attributes/CooldownAttribute.cs b/DisCatSharp.CommandsNext/Attributes/CooldownAttribute.cs
index 700ec7c19b..a364d7ead3 100644
--- a/DisCatSharp.CommandsNext/Attributes/CooldownAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/CooldownAttribute.cs
@@ -43,7 +43,7 @@ public CooldownAttribute(int maxUses, double resetAfter, CooldownBucketType buck
 		this.MaxUses = maxUses;
 		this.Reset = TimeSpan.FromSeconds(resetAfter);
 		this.BucketType = bucketType;
-		this._buckets = new ConcurrentDictionary<string, CommandCooldownBucket>();
+		this._buckets = new();
 	}
 
 	/// <summary>
@@ -66,7 +66,11 @@ public CommandCooldownBucket GetBucket(CommandContext ctx)
 	public TimeSpan GetRemainingCooldown(CommandContext ctx)
 	{
 		var bucket = this.GetBucket(ctx);
-		return bucket == null ? TimeSpan.Zero : bucket.RemainingUses > 0 ? TimeSpan.Zero : bucket.ResetsAt - DateTimeOffset.UtcNow;
+		return bucket == null
+			? TimeSpan.Zero
+			: bucket.RemainingUses > 0
+				? TimeSpan.Zero
+				: bucket.ResetsAt - DateTimeOffset.UtcNow;
 	}
 
 	/// <summary>
@@ -110,7 +114,7 @@ public override async Task<bool> ExecuteCheckAsync(CommandContext ctx, bool help
 		var bid = this.GetBucketId(ctx, out var usr, out var chn, out var gld);
 		if (!this._buckets.TryGetValue(bid, out var bucket))
 		{
-			bucket = new CommandCooldownBucket(this.MaxUses, this.Reset, usr, chn, gld);
+			bucket = new(this.MaxUses, this.Reset, usr, chn, gld);
 			this._buckets.AddOrUpdate(bid, bucket, (k, v) => bucket);
 		}
 
@@ -215,7 +219,7 @@ internal CommandCooldownBucket(int maxUses, TimeSpan resetAfter, ulong userId =
 		this.ChannelId = channelId;
 		this.GuildId = guildId;
 		this.BucketId = MakeId(userId, channelId, guildId);
-		this._usageSemaphore = new SemaphoreSlim(1, 1);
+		this._usageSemaphore = new(1, 1);
 	}
 
 	/// <summary>
@@ -267,7 +271,7 @@ internal async Task<bool> DecrementUseAsync()
 	/// </summary>
 	/// <param name="other"><see cref="CommandCooldownBucket"/> to compare to.</param>
 	/// <returns>Whether the <see cref="CommandCooldownBucket"/> is equal to this <see cref="CommandCooldownBucket"/>.</returns>
-	public bool Equals(CommandCooldownBucket other) => other is not null && (ReferenceEquals(this, other) || (this.UserId == other.UserId && this.ChannelId == other.ChannelId && this.GuildId == other.GuildId));
+	public bool Equals(CommandCooldownBucket other) => other is not null && (ReferenceEquals(this, other) || this.UserId == other.UserId && this.ChannelId == other.ChannelId && this.GuildId == other.GuildId);
 
 	/// <summary>
 	/// Gets the hash code for this <see cref="CommandCooldownBucket"/>.
@@ -286,7 +290,7 @@ internal async Task<bool> DecrementUseAsync()
 		var null1 = bucket1 is null;
 		var null2 = bucket2 is null;
 
-		return (null1 && null2) || (null1 == null2 && null1.Equals(null2));
+		return null1 && null2 || null1 == null2 && null1.Equals(null2);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp.CommandsNext/Attributes/RequireBoostingAttribute.cs b/DisCatSharp.CommandsNext/Attributes/RequireBoostingAttribute.cs
index 09455ebcba..5a973b1699 100644
--- a/DisCatSharp.CommandsNext/Attributes/RequireBoostingAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/RequireBoostingAttribute.cs
@@ -54,8 +54,6 @@ public override async Task<bool> ExecuteCheckAsync(CommandContext ctx, bool help
 			return member != null && member.PremiumSince.HasValue ? await Task.FromResult(member.PremiumSince.Value.UtcDateTime.Date < DateTime.UtcNow.Date.AddDays(-this.Since)).ConfigureAwait(false) : await Task.FromResult(false).ConfigureAwait(false);
 		}
 		else
-		{
 			return ctx.Member != null && ctx.Member.PremiumSince.HasValue ? await Task.FromResult(ctx.Member.PremiumSince.Value.UtcDateTime.Date < DateTime.UtcNow.Date.AddDays(-this.Since)).ConfigureAwait(false) : await Task.FromResult(false).ConfigureAwait(false);
-		}
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Attributes/RequireBotPermissionsAttribute.cs b/DisCatSharp.CommandsNext/Attributes/RequireBotPermissionsAttribute.cs
index 86ccad62a2..5eb25b54a7 100644
--- a/DisCatSharp.CommandsNext/Attributes/RequireBotPermissionsAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/RequireBotPermissionsAttribute.cs
@@ -51,9 +51,7 @@ public override async Task<bool> ExecuteCheckAsync(CommandContext ctx, bool help
 
 		var channel = ctx.Channel;
 		if (ctx.Channel.GuildId == null)
-		{
 			channel = await ctx.Client.GetChannelAsync(ctx.Channel.Id, true).ConfigureAwait(false);
-		}
 		var pbot = channel.PermissionsFor(bot);
 
 		return (pbot & Permissions.Administrator) != 0 || (pbot & this.Permissions) == this.Permissions;
diff --git a/DisCatSharp.CommandsNext/Attributes/RequireDirectMessageAttribute.cs b/DisCatSharp.CommandsNext/Attributes/RequireDirectMessageAttribute.cs
index 42a5dbfbb9..afc7653882 100644
--- a/DisCatSharp.CommandsNext/Attributes/RequireDirectMessageAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/RequireDirectMessageAttribute.cs
@@ -8,7 +8,6 @@ namespace DisCatSharp.CommandsNext.Attributes;
 /// <summary>
 /// Defines that a command is only usable within a direct message channel.
 /// </summary>
-
 [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = false)]
 public sealed class RequireDirectMessageAttribute : CheckBaseAttribute
 {
diff --git a/DisCatSharp.CommandsNext/Attributes/RequireGuildOwnerAttribute.cs b/DisCatSharp.CommandsNext/Attributes/RequireGuildOwnerAttribute.cs
index d23c98774f..3dc28080cc 100644
--- a/DisCatSharp.CommandsNext/Attributes/RequireGuildOwnerAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/RequireGuildOwnerAttribute.cs
@@ -24,8 +24,6 @@ public override async Task<bool> ExecuteCheckAsync(CommandContext ctx, bool help
 			return owner;
 		}
 		else
-		{
 			return false;
-		}
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Attributes/RequireOwnerOrIdAttribute.cs b/DisCatSharp.CommandsNext/Attributes/RequireOwnerOrIdAttribute.cs
index eecb79da75..f1f3f95f29 100644
--- a/DisCatSharp.CommandsNext/Attributes/RequireOwnerOrIdAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/RequireOwnerOrIdAttribute.cs
@@ -41,6 +41,5 @@ public override async Task<bool> ExecuteCheckAsync(CommandContext ctx, bool help
 		var allowed = this.UserIds.Contains(ctx.User.Id);
 
 		return owner || allowed;
-
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Attributes/RequirePermissionsAttribute.cs b/DisCatSharp.CommandsNext/Attributes/RequirePermissionsAttribute.cs
index d386a58ef8..6162662401 100644
--- a/DisCatSharp.CommandsNext/Attributes/RequirePermissionsAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/RequirePermissionsAttribute.cs
@@ -44,18 +44,18 @@ public override async Task<bool> ExecuteCheckAsync(CommandContext ctx, bool help
 
 		var channel = ctx.Channel;
 		if (ctx.Channel.GuildId == null)
-		{
 			channel = await ctx.Client.GetChannelAsync(ctx.Channel.Id, true).ConfigureAwait(false);
-		}
 
 		var usr = ctx.Member;
 		if (usr == null)
 			return false;
+
 		var pusr = channel.PermissionsFor(usr);
 
 		var bot = await ctx.Guild.GetMemberAsync(ctx.Client.CurrentUser.Id).ConfigureAwait(false);
 		if (bot == null)
 			return false;
+
 		var pbot = channel.PermissionsFor(bot);
 
 		var usrok = ctx.Guild.OwnerId == usr.Id;
diff --git a/DisCatSharp.CommandsNext/Attributes/RequirePrefixesAttribute.cs b/DisCatSharp.CommandsNext/Attributes/RequirePrefixesAttribute.cs
index 800134bca8..b87d2fbff3 100644
--- a/DisCatSharp.CommandsNext/Attributes/RequirePrefixesAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/RequirePrefixesAttribute.cs
@@ -39,5 +39,5 @@ public RequirePrefixesAttribute(params string[] prefixes)
 	/// <param name="ctx">The command context.</param>
 	/// <param name="help">If true, help - returns true.</param>
 	public override Task<bool> ExecuteCheckAsync(CommandContext ctx, bool help)
-		=> Task.FromResult((help && this.ShowInHelp) || this.Prefixes.Contains(ctx.Prefix, ctx.CommandsNext.GetStringComparer()));
+		=> Task.FromResult(help && this.ShowInHelp || this.Prefixes.Contains(ctx.Prefix, ctx.CommandsNext.GetStringComparer()));
 }
diff --git a/DisCatSharp.CommandsNext/Attributes/RequireRolesAttribute.cs b/DisCatSharp.CommandsNext/Attributes/RequireRolesAttribute.cs
index bb5e2c0441..2d15877003 100644
--- a/DisCatSharp.CommandsNext/Attributes/RequireRolesAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/RequireRolesAttribute.cs
@@ -53,7 +53,7 @@ public override Task<bool> ExecuteCheckAsync(CommandContext ctx, bool help)
 			RoleCheckMode.All => Task.FromResult(this.RoleNames.Count == inc),
 			RoleCheckMode.SpecifiedOnly => Task.FromResult(rnc == inc),
 			RoleCheckMode.None => Task.FromResult(inc == 0),
-			_ => Task.FromResult(inc > 0),
+			_ => Task.FromResult(inc > 0)
 		};
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Attributes/RequireUserPermissionsAttribute.cs b/DisCatSharp.CommandsNext/Attributes/RequireUserPermissionsAttribute.cs
index 8ce5eca6f0..ed746133e7 100644
--- a/DisCatSharp.CommandsNext/Attributes/RequireUserPermissionsAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/RequireUserPermissionsAttribute.cs
@@ -25,7 +25,6 @@ public sealed class RequireUserPermissionsAttribute : CheckBaseAttribute
 	/// Defines that usage of this command is restricted to members with specified permissions.
 	/// </summary>
 	/// <param name="permissions">Permissions required to execute this command.</param>
-
 	/// <param name="ignoreDms">Sets this check's behaviour in DMs. True means the check will always pass in DMs, whereas false means that it will always fail.</param>
 	public RequireUserPermissionsAttribute(Permissions permissions, bool ignoreDms = true)
 	{
diff --git a/DisCatSharp.CommandsNext/CommandsNextExtension.cs b/DisCatSharp.CommandsNext/CommandsNextExtension.cs
index 1537e483a0..90c7f14ac7 100644
--- a/DisCatSharp.CommandsNext/CommandsNextExtension.cs
+++ b/DisCatSharp.CommandsNext/CommandsNextExtension.cs
@@ -43,6 +43,7 @@ public class CommandsNextExtension : BaseExtension
 	/// Gets the user friendly type names.
 	/// </summary>
 	private readonly Dictionary<Type, string> _userFriendlyTypeNames;
+
 	/// <summary>
 	/// Gets the argument converters.
 	/// </summary>
@@ -60,13 +61,13 @@ public IServiceProvider Services
 	/// <param name="cfg">The cfg.</param>
 	internal CommandsNextExtension(CommandsNextConfiguration cfg)
 	{
-		this._config = new CommandsNextConfiguration(cfg);
-		this._topLevelCommands = new Dictionary<string, Command>();
-		this._registeredCommandsLazy = new Lazy<IReadOnlyDictionary<string, Command>>(() => new ReadOnlyDictionary<string, Command>(this._topLevelCommands));
-		this._helpFormatter = new HelpFormatterFactory();
+		this._config = new(cfg);
+		this._topLevelCommands = new();
+		this._registeredCommandsLazy = new(() => new ReadOnlyDictionary<string, Command>(this._topLevelCommands));
+		this._helpFormatter = new();
 		this._helpFormatter.SetFormatterType<DefaultHelpFormatter>();
 
-		this.ArgumentConverters = new Dictionary<Type, IArgumentConverter>
+		this.ArgumentConverters = new()
 		{
 			[typeof(string)] = new StringConverter(),
 			[typeof(bool)] = new BoolConverter(),
@@ -95,10 +96,10 @@ internal CommandsNextExtension(CommandsNextConfiguration cfg)
 			[typeof(DiscordThreadChannel)] = new DiscordThreadChannelConverter(),
 			[typeof(DiscordInvite)] = new DiscordInviteConverter(),
 			[typeof(DiscordColor)] = new DiscordColorConverter(),
-			[typeof(DiscordScheduledEvent)] = new DiscordScheduledEventConverter(),
+			[typeof(DiscordScheduledEvent)] = new DiscordScheduledEventConverter()
 		};
 
-		this._userFriendlyTypeNames = new Dictionary<Type, string>()
+		this._userFriendlyTypeNames = new()
 		{
 			[typeof(string)] = "string",
 			[typeof(bool)] = "boolean",
@@ -158,7 +159,8 @@ internal CommandsNextExtension(CommandsNextConfiguration cfg)
 	/// <typeparam name="T">Type of the formatter to use.</typeparam>
 	public void SetHelpFormatter<T>() where T : BaseHelpFormatter => this._helpFormatter.SetFormatterType<T>();
 
-	#region DiscordClient Registration
+#region DiscordClient Registration
+
 	/// <summary>
 	/// DO NOT USE THIS MANUALLY.
 	/// </summary>
@@ -171,8 +173,8 @@ protected internal override void Setup(DiscordClient client)
 
 		this.Client = client;
 
-		this._executed = new AsyncEvent<CommandsNextExtension, CommandExecutionEventArgs>("COMMAND_EXECUTED", TimeSpan.Zero, this.Client.EventErrorHandler);
-		this._error = new AsyncEvent<CommandsNextExtension, CommandErrorEventArgs>("COMMAND_ERRORED", TimeSpan.Zero, this.Client.EventErrorHandler);
+		this._executed = new("COMMAND_EXECUTED", TimeSpan.Zero, this.Client.EventErrorHandler);
+		this._error = new("COMMAND_ERRORED", TimeSpan.Zero, this.Client.EventErrorHandler);
 
 		if (this._config.UseDefaultCommandHandler)
 			this.Client.MessageCreated += this.HandleCommandsAsync;
@@ -195,11 +197,12 @@ protected internal override void Setup(DiscordClient client)
 				foreach (var xc in tcmds)
 					this.AddToCommandDictionary(xc.Build(null));
 		}
-
 	}
-	#endregion
 
-	#region Command Handling
+#endregion
+
+#region Command Handling
+
 	/// <summary>
 	/// Handles the commands async.
 	/// </summary>
@@ -239,7 +242,10 @@ private async Task HandleCommandsAsync(DiscordClient sender, MessageCreateEventA
 		var ctx = this.CreateContext(e.Message, pfx, cmd, args);
 		if (cmd == null)
 		{
-			await this._error.InvokeAsync(this, new CommandErrorEventArgs(this.Client.ServiceProvider) { Context = ctx, Exception = new CommandNotFoundException(fname) }).ConfigureAwait(false);
+			await this._error.InvokeAsync(this, new(this.Client.ServiceProvider)
+			{
+				Context = ctx, Exception = new CommandNotFoundException(fname)
+			}).ConfigureAwait(false);
 			return;
 		}
 
@@ -295,9 +301,7 @@ public Command FindCommand(string commandString, out string rawArguments)
 				cmd = cm2.Children.FirstOrDefault(x => x.Name.ToLowerInvariant() == next || x.Aliases?.Any(xx => xx.ToLowerInvariant() == next) == true);
 			}
 			else
-			{
 				cmd = cm2.Children.FirstOrDefault(x => x.Name == next || x.Aliases?.Contains(next) == true);
-			}
 
 			if (cmd == null)
 			{
@@ -336,7 +340,7 @@ public CommandContext CreateContext(DiscordMessage msg, string prefix, Command c
 		if (cmd != null && (cmd.Module is TransientCommandModule || cmd.Module == null))
 		{
 			var scope = ctx.Services.CreateScope();
-			ctx.ServiceScopeContext = new CommandContext.ServiceContext(ctx.Services, scope);
+			ctx.ServiceScopeContext = new(ctx.Services, scope);
 			ctx.Services = scope.ServiceProvider;
 		}
 
@@ -358,13 +362,22 @@ public async Task ExecuteCommandAsync(CommandContext ctx)
 			var res = await cmd.ExecuteAsync(ctx).ConfigureAwait(false);
 
 			if (res.IsSuccessful)
-				await this._executed.InvokeAsync(this, new CommandExecutionEventArgs(this.Client.ServiceProvider) { Context = res.Context }).ConfigureAwait(false);
+				await this._executed.InvokeAsync(this, new(this.Client.ServiceProvider)
+				{
+					Context = res.Context
+				}).ConfigureAwait(false);
 			else
-				await this._error.InvokeAsync(this, new CommandErrorEventArgs(this.Client.ServiceProvider) { Context = res.Context, Exception = res.Exception }).ConfigureAwait(false);
+				await this._error.InvokeAsync(this, new(this.Client.ServiceProvider)
+				{
+					Context = res.Context, Exception = res.Exception
+				}).ConfigureAwait(false);
 		}
 		catch (Exception ex)
 		{
-			await this._error.InvokeAsync(this, new CommandErrorEventArgs(this.Client.ServiceProvider) { Context = ctx, Exception = ex }).ConfigureAwait(false);
+			await this._error.InvokeAsync(this, new(this.Client.ServiceProvider)
+			{
+				Context = ctx, Exception = ex
+			}).ConfigureAwait(false);
 		}
 		finally
 		{
@@ -388,9 +401,11 @@ private async Task RunAllChecksAsync(Command cmd, CommandContext ctx)
 		if (fchecks.Any())
 			throw new ChecksFailedException(cmd, ctx, fchecks);
 	}
-	#endregion
 
-	#region Command Registration
+#endregion
+
+#region Command Registration
+
 	/// <summary>
 	/// Gets a dictionary of registered top-level commands.
 	/// </summary>
@@ -401,6 +416,7 @@ public IReadOnlyDictionary<string, Command> RegisteredCommands
 	/// Gets or sets the top level commands.
 	/// </summary>
 	private readonly Dictionary<string, Command> _topLevelCommands;
+
 	private readonly Lazy<IReadOnlyDictionary<string, Command>> _registeredCommandsLazy;
 
 	/// <summary>
@@ -478,7 +494,6 @@ private void RegisterCommands(Type t, CommandGroupBuilder currentParent, IEnumer
 		var moduleChecks = new List<CheckBaseAttribute>();
 
 		foreach (var xa in moduleAttributes)
-		{
 			switch (xa)
 			{
 				case GroupAttribute g:
@@ -506,7 +521,7 @@ private void RegisterCommands(Type t, CommandGroupBuilder currentParent, IEnumer
 							groupBuilder.WithExecutionCheck(chk);
 
 					foreach (var mi in ti.DeclaredMethods.Where(x => x.IsCommandCandidate(out _) && x.GetCustomAttribute<GroupCommandAttribute>() != null))
-						groupBuilder.WithOverload(new CommandOverloadBuilder(mi));
+						groupBuilder.WithOverload(new(mi));
 					break;
 
 				case AliasesAttribute a:
@@ -532,7 +547,6 @@ private void RegisterCommands(Type t, CommandGroupBuilder currentParent, IEnumer
 					groupBuilder.WithCustomAttribute(xa);
 					break;
 			}
-		}
 
 		if (!isModule)
 		{
@@ -578,14 +592,13 @@ private void RegisterCommands(Type t, CommandGroupBuilder currentParent, IEnumer
 					groupBuilder.WithChild(commandBuilder);
 			}
 
-			commandBuilder.WithOverload(new CommandOverloadBuilder(m));
+			commandBuilder.WithOverload(new(m));
 
 			if (!isModule && moduleChecks.Any())
 				foreach (var chk in moduleChecks)
 					commandBuilder.WithExecutionCheck(chk);
 
 			foreach (var xa in attrs)
-			{
 				switch (xa)
 				{
 					case AliasesAttribute a:
@@ -609,7 +622,6 @@ private void RegisterCommands(Type t, CommandGroupBuilder currentParent, IEnumer
 						commandBuilder.WithCustomAttribute(xa);
 						break;
 				}
-			}
 
 			if (!isModule && moduleHidden)
 				commandBuilder.WithHiddenStatus(true);
@@ -676,7 +688,7 @@ private void AddToCommandDictionary(Command cmd)
 		if (cmd.Parent != null)
 			return;
 
-		if (this._topLevelCommands.ContainsKey(cmd.Name) || (cmd.Aliases != null && cmd.Aliases.Any(xs => this._topLevelCommands.ContainsKey(xs))))
+		if (this._topLevelCommands.ContainsKey(cmd.Name) || cmd.Aliases != null && cmd.Aliases.Any(xs => this._topLevelCommands.ContainsKey(xs)))
 			throw new DuplicateCommandException(cmd.QualifiedName);
 
 		this._topLevelCommands[cmd.Name] = cmd;
@@ -684,9 +696,11 @@ private void AddToCommandDictionary(Command cmd)
 			foreach (var xs in cmd.Aliases)
 				this._topLevelCommands[xs] = cmd;
 	}
-	#endregion
 
-	#region Default Help
+#endregion
+
+#region Default Help
+
 	/// <summary>
 	/// Represents the default help module.
 	/// </summary>
@@ -718,8 +732,8 @@ public async Task DefaultHelpAsync(CommandContext ctx, [Description("Command to
 					}
 
 					cmd = ctx.Config.CaseSensitive
-						? searchIn.FirstOrDefault(xc => xc.Name == c || (xc.Aliases != null && xc.Aliases.Contains(c)))
-						: searchIn.FirstOrDefault(xc => xc.Name.ToLowerInvariant() == c.ToLowerInvariant() || (xc.Aliases != null && xc.Aliases.Select(xs => xs.ToLowerInvariant()).Contains(c.ToLowerInvariant())));
+						? searchIn.FirstOrDefault(xc => xc.Name == c || xc.Aliases != null && xc.Aliases.Contains(c))
+						: searchIn.FirstOrDefault(xc => xc.Name.ToLowerInvariant() == c.ToLowerInvariant() || xc.Aliases != null && xc.Aliases.Select(xs => xs.ToLowerInvariant()).Contains(c.ToLowerInvariant()));
 
 					if (cmd == null)
 						break;
@@ -786,12 +800,13 @@ public async Task DefaultHelpAsync(CommandContext ctx, [Description("Command to
 				await ctx.RespondAsync(builder).ConfigureAwait(false);
 			else
 				await ctx.Member.SendMessageAsync(builder).ConfigureAwait(false);
-
 		}
 	}
-	#endregion
 
-	#region Sudo
+#endregion
+
+#region Sudo
+
 	/// <summary>
 	/// Creates a fake command context to execute commands with.
 	/// </summary>
@@ -819,10 +834,10 @@ public CommandContext CreateFakeContext(DiscordUser actor, DiscordChannel channe
 			Pinned = false,
 			MentionEveryone = messageContents.Contains("@everyone"),
 			IsTts = false,
-			AttachmentsInternal = new List<DiscordAttachment>(),
-			EmbedsInternal = new List<DiscordEmbed>(),
+			AttachmentsInternal = new(),
+			EmbedsInternal = new(),
 			TimestampRaw = now.ToString("yyyy-MM-ddTHH:mm:sszzz"),
-			ReactionsInternal = new List<DiscordReaction>()
+			ReactionsInternal = new()
 		};
 
 		var mentionedUsers = new List<DiscordUser>();
@@ -838,9 +853,7 @@ public CommandContext CreateFakeContext(DiscordUser actor, DiscordChannel channe
 				mentionedChannels = Utilities.GetChannelMentions(msg).Select(xid => msg.Channel.Guild.GetChannel(xid)).ToList();
 			}
 			else
-			{
 				mentionedUsers = Utilities.GetUserMentions(msg).Select(this.Client.GetCachedOrEmptyUserInternal).ToList();
-			}
 		}
 
 		msg.MentionedUsersInternal = mentionedUsers;
@@ -862,15 +875,17 @@ public CommandContext CreateFakeContext(DiscordUser actor, DiscordChannel channe
 		if (cmd != null && (cmd.Module is TransientCommandModule || cmd.Module == null))
 		{
 			var scope = ctx.Services.CreateScope();
-			ctx.ServiceScopeContext = new CommandContext.ServiceContext(ctx.Services, scope);
+			ctx.ServiceScopeContext = new(ctx.Services, scope);
 			ctx.Services = scope.ServiceProvider;
 		}
 
 		return ctx;
 	}
-	#endregion
 
-	#region Type Conversion
+#endregion
+
+#region Type Conversion
+
 	/// <summary>
 	/// Converts a string to specified type.
 	/// </summary>
@@ -903,7 +918,10 @@ public async Task<object> ConvertArgument(string value, CommandContext ctx, Type
 		var m = this._convertGeneric.MakeGenericMethod(type);
 		try
 		{
-			return await (m.Invoke(this, new object[] { value, ctx }) as Task<object>).ConfigureAwait(false);
+			return await (m.Invoke(this, new object[]
+			{
+				value, ctx
+			}) as Task<object>).ConfigureAwait(false);
 		}
 		catch (TargetInvocationException ex)
 		{
@@ -996,13 +1014,15 @@ public string GetUserFriendlyTypeName(Type t)
 
 		var ti = t.GetTypeInfo();
 		if (!ti.IsGenericTypeDefinition || t.GetGenericTypeDefinition() != typeof(Nullable<>)) return t.Name;
+
 		var tn = ti.GenericTypeArguments[0];
 		return this._userFriendlyTypeNames.TryGetValue(tn, out var name) ? name : tn.Name;
-
 	}
-	#endregion
 
-	#region Helpers
+#endregion
+
+#region Helpers
+
 	/// <summary>
 	/// Allows easier interoperability with reflection by turning the <see cref="Task{T}"/> returned by <see cref="ConvertArgument"/>
 	/// into a task containing <see cref="object"/>, using the provided generic type information.
@@ -1019,9 +1039,11 @@ internal IEqualityComparer<string> GetStringComparer()
 		=> this._config.CaseSensitive
 			? StringComparer.Ordinal
 			: StringComparer.OrdinalIgnoreCase;
-	#endregion
 
-	#region Events
+#endregion
+
+#region Events
+
 	/// <summary>
 	/// Triggered whenever a command executes successfully.
 	/// </summary>
@@ -1030,6 +1052,7 @@ public event AsyncEventHandler<CommandsNextExtension, CommandExecutionEventArgs>
 		add => this._executed.Register(value);
 		remove => this._executed.Unregister(value);
 	}
+
 	private AsyncEvent<CommandsNextExtension, CommandExecutionEventArgs> _executed;
 
 	/// <summary>
@@ -1040,6 +1063,7 @@ public event AsyncEventHandler<CommandsNextExtension, CommandErrorEventArgs> Com
 		add => this._error.Register(value);
 		remove => this._error.Unregister(value);
 	}
+
 	private AsyncEvent<CommandsNextExtension, CommandErrorEventArgs> _error;
 
 	/// <summary>
@@ -1055,5 +1079,6 @@ private Task OnCommandExecuted(CommandExecutionEventArgs e)
 	/// <param name="e">The command error event arguments.</param>
 	private Task OnCommandErrored(CommandErrorEventArgs e)
 		=> this._error.InvokeAsync(this, e);
-	#endregion
+
+#endregion
 }
diff --git a/DisCatSharp.CommandsNext/CommandsNextUtilities.cs b/DisCatSharp.CommandsNext/CommandsNextUtilities.cs
index 1d91a88b6e..a1a6fa99cc 100644
--- a/DisCatSharp.CommandsNext/CommandsNextUtilities.cs
+++ b/DisCatSharp.CommandsNext/CommandsNextUtilities.cs
@@ -36,7 +36,11 @@ public static class CommandsNextUtilities
 	public static int GetStringPrefixLength(this DiscordMessage msg, string str, StringComparison comparisonType = StringComparison.Ordinal)
 	{
 		var content = msg.Content;
-		return str.Length >= content.Length ? -1 : !content.StartsWith(str, comparisonType) ? -1 : str.Length;
+		return str.Length >= content.Length
+			? -1
+			: !content.StartsWith(str, comparisonType)
+				? -1
+				: str.Length;
 	}
 
 	/// <summary>
@@ -85,6 +89,7 @@ internal static string ExtractNextArgument(this string str, ref int startPos)
 		for (; i < str.Length; i++)
 			if (!char.IsWhiteSpace(str[i]))
 				break;
+
 		startPos = i;
 
 		var endPosition = -1;
@@ -99,7 +104,7 @@ internal static string ExtractNextArgument(this string str, ref int startPos)
 				if (!inEscape && !inBacktick && !inTripleBacktick)
 				{
 					inEscape = true;
-					if (str.IndexOf("\\`", i) == i || str.IndexOf("\\\"", i) == i || str.IndexOf("\\\\", i) == i || (str.Length >= i && char.IsWhiteSpace(str[i + 1])))
+					if (str.IndexOf("\\`", i) == i || str.IndexOf("\\\"", i) == i || str.IndexOf("\\\\", i) == i || str.Length >= i && char.IsWhiteSpace(str[i + 1]))
 						removeIndices.Add(i - startPosition);
 					i++;
 				}
@@ -234,13 +239,13 @@ internal static async Task<ArgumentBindingResult> BindArguments(CommandContext c
 			}
 
 			if (argValue == null && !arg.IsOptional && !arg.IsCatchAll)
-				return new ArgumentBindingResult(new ArgumentException("Not enough arguments supplied to the command."));
+				return new(new ArgumentException("Not enough arguments supplied to the command."));
 			else if (argValue == null)
 				rawArgumentList.Add(null);
 		}
 
 		if (!ignoreSurplus && foundAt < argString.Length)
-			return new ArgumentBindingResult(new ArgumentException("Too many arguments were supplied to this command."));
+			return new(new ArgumentException("Too many arguments were supplied to this command."));
 
 		for (var i = 0; i < overload.Arguments.Count; i++)
 		{
@@ -257,8 +262,9 @@ internal static async Task<ArgumentBindingResult> BindArguments(CommandContext c
 					}
 					catch (Exception ex)
 					{
-						return new ArgumentBindingResult(ex);
+						return new(ex);
 					}
+
 					i++;
 				}
 
@@ -266,19 +272,17 @@ internal static async Task<ArgumentBindingResult> BindArguments(CommandContext c
 				break;
 			}
 			else
-			{
 				try
 				{
 					args[i + 2] = rawArgumentList[i] != null ? await ctx.CommandsNext.ConvertArgument(rawArgumentList[i], ctx, arg.Type).ConfigureAwait(false) : arg.DefaultValue;
 				}
 				catch (Exception ex)
 				{
-					return new ArgumentBindingResult(ex);
+					return new(ex);
 				}
-			}
 		}
 
-		return new ArgumentBindingResult(args, rawArgumentList);
+		return new(args, rawArgumentList);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp.CommandsNext/Converters/ArgumentBindingResult.cs b/DisCatSharp.CommandsNext/Converters/ArgumentBindingResult.cs
index f9bde0d8e1..d0115fb0d1 100644
--- a/DisCatSharp.CommandsNext/Converters/ArgumentBindingResult.cs
+++ b/DisCatSharp.CommandsNext/Converters/ArgumentBindingResult.cs
@@ -12,14 +12,17 @@ public readonly struct ArgumentBindingResult
 	/// Gets a value indicating whether the binding is successful.
 	/// </summary>
 	public bool IsSuccessful { get; }
+
 	/// <summary>
 	/// Gets the converted.
 	/// </summary>
 	public object[] Converted { get; }
+
 	/// <summary>
 	/// Gets the raw.
 	/// </summary>
 	public IReadOnlyList<string> Raw { get; }
+
 	/// <summary>
 	/// Gets the reason.
 	/// </summary>
diff --git a/DisCatSharp.CommandsNext/Converters/DefaultHelpFormatter.cs b/DisCatSharp.CommandsNext/Converters/DefaultHelpFormatter.cs
index a399301c2c..537a580cef 100644
--- a/DisCatSharp.CommandsNext/Converters/DefaultHelpFormatter.cs
+++ b/DisCatSharp.CommandsNext/Converters/DefaultHelpFormatter.cs
@@ -49,7 +49,7 @@ public override BaseHelpFormatter WithCommand(Command command)
 			this.EmbedBuilder.WithDescription($"{this.EmbedBuilder.Description}\n\nThis group can be executed as a standalone command.");
 
 		if (command.Aliases?.Any() == true)
-			this.EmbedBuilder.AddField(new DiscordEmbedField("Aliases", string.Join(", ", command.Aliases.Select(Formatter.InlineCode))));
+			this.EmbedBuilder.AddField(new("Aliases", string.Join(", ", command.Aliases.Select(Formatter.InlineCode))));
 
 		if (command.Overloads?.Any() == true)
 		{
@@ -70,7 +70,7 @@ public override BaseHelpFormatter WithCommand(Command command)
 				sb.Append('\n');
 			}
 
-			this.EmbedBuilder.AddField(new DiscordEmbedField("Arguments", sb.ToString().Trim()));
+			this.EmbedBuilder.AddField(new("Arguments", sb.ToString().Trim()));
 		}
 
 		return this;
@@ -83,7 +83,7 @@ public override BaseHelpFormatter WithCommand(Command command)
 	/// <returns>This help formatter.</returns>
 	public override BaseHelpFormatter WithSubcommands(IEnumerable<Command> subcommands)
 	{
-		this.EmbedBuilder.AddField(new DiscordEmbedField(this._command != null ? "Subcommands" : "Commands", string.Join(", ", subcommands.Select(x => Formatter.InlineCode(x.Name)))));
+		this.EmbedBuilder.AddField(new(this._command != null ? "Subcommands" : "Commands", string.Join(", ", subcommands.Select(x => Formatter.InlineCode(x.Name)))));
 
 		return this;
 	}
@@ -97,6 +97,6 @@ public override CommandHelpMessage Build()
 		if (this._command == null)
 			this.EmbedBuilder.WithDescription("Listing all top-level commands and groups. Specify a command to see more information.");
 
-		return new CommandHelpMessage(embed: this.EmbedBuilder.Build());
+		return new(embed: this.EmbedBuilder.Build());
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Converters/EntityConverters.cs b/DisCatSharp.CommandsNext/Converters/EntityConverters.cs
index 1edb31fb7c..848dfbf17c 100644
--- a/DisCatSharp.CommandsNext/Converters/EntityConverters.cs
+++ b/DisCatSharp.CommandsNext/Converters/EntityConverters.cs
@@ -43,7 +43,7 @@ async Task<Optional<DiscordUser>> IArgumentConverter<DiscordUser>.ConvertAsync(s
 
 		var us = ctx.Client.Guilds.Values
 			.SelectMany(xkvp => xkvp.Members.Values)
-			.Where(xm => (cs ? xm.Username : xm.Username.ToLowerInvariant()) == un && ((dv != null && xm.Discriminator == dv) || dv == null));
+			.Where(xm => (cs ? xm.Username : xm.Username.ToLowerInvariant()) == un && (dv != null && xm.Discriminator == dv || dv == null));
 
 		var usr = us.FirstOrDefault();
 		return Optional.FromNullable<DiscordUser>(usr);
@@ -91,8 +91,8 @@ async Task<Optional<DiscordMember>> IArgumentConverter<DiscordMember>.ConvertAsy
 		var dv = di != -1 ? value[(di + 1)..] : null;
 
 		var us = ctx.Guild.Members.Values
-			.Where(xm => ((cs ? xm.Username : xm.Username.ToLowerInvariant()) == un && ((dv != null && xm.Discriminator == dv) || dv == null))
-					  || (cs ? xm.Nickname : xm.Nickname?.ToLowerInvariant()) == value);
+			.Where(xm => (cs ? xm.Username : xm.Username.ToLowerInvariant()) == un && (dv != null && xm.Discriminator == dv || dv == null)
+			             || (cs ? xm.Nickname : xm.Nickname?.ToLowerInvariant()) == value);
 
 		return Optional.FromNullable(us.FirstOrDefault());
 	}
@@ -216,11 +216,9 @@ public class DiscordGuildConverter : IArgumentConverter<DiscordGuild>
 	Task<Optional<DiscordGuild>> IArgumentConverter<DiscordGuild>.ConvertAsync(string value, CommandContext ctx)
 	{
 		if (ulong.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var gid))
-		{
 			return ctx.Client.Guilds.TryGetValue(gid, out var result)
 				? Task.FromResult(Optional.Some(result))
 				: Task.FromResult(Optional<DiscordGuild>.None);
-		}
 
 		var cs = ctx.Config.CaseSensitive;
 		if (!cs)
@@ -231,7 +229,6 @@ Task<Optional<DiscordGuild>> IArgumentConverter<DiscordGuild>.ConvertAsync(strin
 	}
 }
 
-
 /// <summary>
 /// Represents a discord invite converter.
 /// </summary>
@@ -248,7 +245,9 @@ async Task<Optional<DiscordInvite>> IArgumentConverter<DiscordInvite>.ConvertAsy
 		if (m.Success)
 		{
 			ulong? eventId = ulong.TryParse(m.Groups["event"].Value, NumberStyles.Integer, CultureInfo.InvariantCulture,
-				out var eid) ? eid : null;
+				out var eid)
+				? eid
+				: null;
 			var result = await ctx.Client.GetInviteByCodeAsync(m.Groups["code"].Value, scheduledEventId: eventId).ConfigureAwait(false);
 			return Optional.FromNullable(result);
 		}
@@ -279,8 +278,8 @@ async Task<Optional<DiscordMessage>> IArgumentConverter<DiscordMessage>.ConvertA
 		{
 			var uripath = DiscordRegEx.MessageLink.Match(uri.AbsoluteUri);
 			if (!uripath.Success
-				|| !ulong.TryParse(uripath.Groups["channel"].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var cid)
-				|| !ulong.TryParse(uripath.Groups["message"].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out mid))
+			    || !ulong.TryParse(uripath.Groups["channel"].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var cid)
+			    || !ulong.TryParse(uripath.Groups["message"].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out mid))
 				return Optional.None;
 
 			var chn = await ctx.Client.GetChannelAsync(cid).ConfigureAwait(false);
@@ -322,10 +321,10 @@ async Task<Optional<DiscordScheduledEvent>> IArgumentConverter<DiscordScheduledE
 		{
 			var uripath = DiscordRegEx.Event.Match(uri.AbsoluteUri);
 			if (uripath.Success
-				&& ulong.TryParse(uripath.Groups["guild"].Value, NumberStyles.Integer, CultureInfo.InvariantCulture,
-					out var gid)
-				&& ulong.TryParse(uripath.Groups["event"].Value, NumberStyles.Integer, CultureInfo.InvariantCulture,
-					out seid))
+			    && ulong.TryParse(uripath.Groups["guild"].Value, NumberStyles.Integer, CultureInfo.InvariantCulture,
+				    out var gid)
+			    && ulong.TryParse(uripath.Groups["event"].Value, NumberStyles.Integer, CultureInfo.InvariantCulture,
+				    out seid))
 			{
 				var guild = await ctx.Client.GetGuildAsync(gid).ConfigureAwait(false);
 				if (guild == null)
@@ -384,16 +383,16 @@ Task<Optional<DiscordEmoji>> IArgumentConverter<DiscordEmoji>.ConvertAsync(strin
 			return !ulong.TryParse(sid, NumberStyles.Integer, CultureInfo.InvariantCulture, out var id)
 				? Task.FromResult(Optional<DiscordEmoji>.None)
 				: DiscordEmoji.TryFromGuildEmote(ctx.Client, id, out emoji)
-				? Task.FromResult(Optional.Some(emoji))
-				: Task.FromResult(Optional.Some(new DiscordEmoji
-				{
-					Discord = ctx.Client,
-					Id = id,
-					Name = name,
-					IsAnimated = anim,
-					RequiresColons = true,
-					IsManaged = false
-				}));
+					? Task.FromResult(Optional.Some(emoji))
+					: Task.FromResult(Optional.Some(new DiscordEmoji
+					{
+						Discord = ctx.Client,
+						Id = id,
+						Name = name,
+						IsAnimated = anim,
+						RequiresColons = true,
+						IsManaged = false
+					}));
 		}
 
 		return Task.FromResult(Optional<DiscordEmoji>.None);
diff --git a/DisCatSharp.CommandsNext/Converters/EnumConverter.cs b/DisCatSharp.CommandsNext/Converters/EnumConverter.cs
index 32f2fc084c..df7a298a26 100644
--- a/DisCatSharp.CommandsNext/Converters/EnumConverter.cs
+++ b/DisCatSharp.CommandsNext/Converters/EnumConverter.cs
@@ -23,7 +23,7 @@ Task<Optional<T>> IArgumentConverter<T>.ConvertAsync(string value, CommandContex
 		return !ti.IsEnum
 			? throw new InvalidOperationException("Cannot convert non-enum value to an enum.")
 			: Enum.TryParse(value, !ctx.Config.CaseSensitive, out T ev)
-			? Task.FromResult(Optional.Some(ev))
-			: Task.FromResult(Optional<T>.None);
+				? Task.FromResult(Optional.Some(ev))
+				: Task.FromResult(Optional<T>.None);
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Converters/HelpFormatterFactory.cs b/DisCatSharp.CommandsNext/Converters/HelpFormatterFactory.cs
index 3cb093ee3f..855d83e8d6 100644
--- a/DisCatSharp.CommandsNext/Converters/HelpFormatterFactory.cs
+++ b/DisCatSharp.CommandsNext/Converters/HelpFormatterFactory.cs
@@ -20,11 +20,17 @@ public HelpFormatterFactory() { }
 	/// <summary>
 	/// Sets the formatter type.
 	/// </summary>
-	public void SetFormatterType<T>() where T : BaseHelpFormatter => this._factory = ActivatorUtilities.CreateFactory(typeof(T), new[] { typeof(CommandContext) });
+	public void SetFormatterType<T>() where T : BaseHelpFormatter => this._factory = ActivatorUtilities.CreateFactory(typeof(T), new[]
+	{
+		typeof(CommandContext)
+	});
 
 	/// <summary>
 	/// Creates the help formatter.
 	/// </summary>
 	/// <param name="ctx">The command context.</param>
-	public BaseHelpFormatter Create(CommandContext ctx) => this._factory(ctx.Services, new object[] { ctx }) as BaseHelpFormatter;
+	public BaseHelpFormatter Create(CommandContext ctx) => this._factory(ctx.Services, new object[]
+	{
+		ctx
+	}) as BaseHelpFormatter;
 }
diff --git a/DisCatSharp.CommandsNext/Converters/TimeConverters.cs b/DisCatSharp.CommandsNext/Converters/TimeConverters.cs
index 3639c465ee..07015949b8 100644
--- a/DisCatSharp.CommandsNext/Converters/TimeConverters.cs
+++ b/DisCatSharp.CommandsNext/Converters/TimeConverters.cs
@@ -77,7 +77,10 @@ Task<Optional<TimeSpan>> IArgumentConverter<TimeSpan>.ConvertAsync(string value,
 		if (TimeSpan.TryParse(value, CultureInfo.InvariantCulture, out var result))
 			return Task.FromResult(Optional.Some(result));
 
-		var gps = new string[] { "days", "hours", "minutes", "seconds" };
+		var gps = new string[]
+		{
+			"days", "hours", "minutes", "seconds"
+		};
 		var mtc = s_timeSpanRegex.Match(value);
 		if (!mtc.Success)
 			return Task.FromResult(Optional<TimeSpan>.None);
@@ -113,7 +116,8 @@ Task<Optional<TimeSpan>> IArgumentConverter<TimeSpan>.ConvertAsync(string value,
 					break;
 			}
 		}
-		result = new TimeSpan(d, h, m, s);
+
+		result = new(d, h, m, s);
 		return Task.FromResult(Optional.Some(result));
 	}
 }
diff --git a/DisCatSharp.CommandsNext/DisCatSharp.CommandsNext.csproj b/DisCatSharp.CommandsNext/DisCatSharp.CommandsNext.csproj
index 2196b55e6f..b7ca446d52 100644
--- a/DisCatSharp.CommandsNext/DisCatSharp.CommandsNext.csproj
+++ b/DisCatSharp.CommandsNext/DisCatSharp.CommandsNext.csproj
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../DisCatSharp.Targets/Version.targets" />
-  <Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
-  <Import Project="../DisCatSharp.Targets/Package.targets" />
-  <Import Project="../DisCatSharp.Targets/NuGet.targets" />
-  <Import Project="../DisCatSharp.Targets/Library.targets" />
-  <Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
-
-  <PropertyGroup>
-    <AssemblyName>DisCatSharp.CommandsNext</AssemblyName>
-    <RootNamespace>DisCatSharp.CommandsNext</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup>
-	<PackageId>DisCatSharp.CommandsNext</PackageId>
-	<Description>
-DisCatSharp Commands Next Extension
-
-Allow your users to use text commands in your bot.
-
-Note: Requires the Message Content Intent enabled for your discord application.
-Documentation: https://docs.dcs.aitsys.dev/articles/modules/commandsnext/intro.html
-	</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Text Commands</PackageTags>
-	<Nullable>annotations</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
-    <ProjectReference Include="..\DisCatSharp.Common\DisCatSharp.Common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
-    <PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-  </ItemGroup>
+	<Import Project="../DisCatSharp.Targets/Version.targets" />
+	<Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
+	<Import Project="../DisCatSharp.Targets/Package.targets" />
+	<Import Project="../DisCatSharp.Targets/NuGet.targets" />
+	<Import Project="../DisCatSharp.Targets/Library.targets" />
+	<Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
+
+	<PropertyGroup>
+		<AssemblyName>DisCatSharp.CommandsNext</AssemblyName>
+		<RootNamespace>DisCatSharp.CommandsNext</RootNamespace>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<PackageId>DisCatSharp.CommandsNext</PackageId>
+		<Description>
+			DisCatSharp Commands Next Extension
+
+			Allow your users to use text commands in your bot.
+
+			Note: Requires the Message Content Intent enabled for your discord application.
+			Documentation: https://docs.dcs.aitsys.dev/articles/modules/commandsnext/intro.html
+		</Description>
+		<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Text Commands</PackageTags>
+		<Nullable>annotations</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
+		<ProjectReference Include="..\DisCatSharp.Common\DisCatSharp.Common.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
+		<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+	</ItemGroup>
 
 </Project>
diff --git a/DisCatSharp.CommandsNext/Entities/Builders/CommandBuilder.cs b/DisCatSharp.CommandsNext/Entities/Builders/CommandBuilder.cs
index 9d78663d16..93dea1add1 100644
--- a/DisCatSharp.CommandsNext/Entities/Builders/CommandBuilder.cs
+++ b/DisCatSharp.CommandsNext/Entities/Builders/CommandBuilder.cs
@@ -92,19 +92,19 @@ public CommandBuilder()
 	/// <param name="module">Module on which this command is to be defined.</param>
 	public CommandBuilder(ICommandModule module)
 	{
-		this._aliasList = new List<string>();
+		this._aliasList = new();
 		this.Aliases = new ReadOnlyCollection<string>(this._aliasList);
 
-		this._executionCheckList = new List<CheckBaseAttribute>();
+		this._executionCheckList = new();
 		this.ExecutionChecks = new ReadOnlyCollection<CheckBaseAttribute>(this._executionCheckList);
 
-		this._overloadArgumentSets = new HashSet<string>();
-		this._overloadList = new List<CommandOverloadBuilder>();
+		this._overloadArgumentSets = new();
+		this._overloadList = new();
 		this.Overloads = new ReadOnlyCollection<CommandOverloadBuilder>(this._overloadList);
 
 		this.Module = module;
 
-		this._customAttributeList = new List<Attribute>();
+		this._customAttributeList = new();
 		this.CustomAttributes = new ReadOnlyCollection<Attribute>(this._customAttributeList);
 	}
 
diff --git a/DisCatSharp.CommandsNext/Entities/Builders/CommandGroupBuilder.cs b/DisCatSharp.CommandsNext/Entities/Builders/CommandGroupBuilder.cs
index 148b9b611a..ca857cbd5d 100644
--- a/DisCatSharp.CommandsNext/Entities/Builders/CommandGroupBuilder.cs
+++ b/DisCatSharp.CommandsNext/Entities/Builders/CommandGroupBuilder.cs
@@ -35,7 +35,7 @@ public CommandGroupBuilder()
 	public CommandGroupBuilder(ICommandModule module)
 		: base(module)
 	{
-		this._childrenList = new List<CommandBuilder>();
+		this._childrenList = new();
 		this.Children = new ReadOnlyCollection<CommandBuilder>(this._childrenList);
 	}
 
diff --git a/DisCatSharp.CommandsNext/Entities/Builders/CommandModuleBuilder.cs b/DisCatSharp.CommandsNext/Entities/Builders/CommandModuleBuilder.cs
index 46ed92dad8..9673367614 100644
--- a/DisCatSharp.CommandsNext/Entities/Builders/CommandModuleBuilder.cs
+++ b/DisCatSharp.CommandsNext/Entities/Builders/CommandModuleBuilder.cs
@@ -60,6 +60,6 @@ internal ICommandModule Build(IServiceProvider services) =>
 		{
 			ModuleLifespan.Singleton => new SingletonCommandModule(this.Type, services),
 			ModuleLifespan.Transient => new TransientCommandModule(this.Type),
-			_ => throw new NotSupportedException("Module lifespans other than transient and singleton are not supported."),
+			_ => throw new NotSupportedException("Module lifespans other than transient and singleton are not supported.")
 		};
 }
diff --git a/DisCatSharp.CommandsNext/Entities/Builders/CommandOverloadBuilder.cs b/DisCatSharp.CommandsNext/Entities/Builders/CommandOverloadBuilder.cs
index 2918bff8f5..b2ab7d7be1 100644
--- a/DisCatSharp.CommandsNext/Entities/Builders/CommandOverloadBuilder.cs
+++ b/DisCatSharp.CommandsNext/Entities/Builders/CommandOverloadBuilder.cs
@@ -87,17 +87,13 @@ private CommandOverloadBuilder(MethodInfo method, object target)
 			setb.Append(arg.ParameterType).Append(';');
 			var ca = new CommandArgument
 			{
-				Name = arg.Name,
-				Type = arg.ParameterType,
-				IsOptional = arg.IsOptional,
-				DefaultValue = arg.IsOptional ? arg.DefaultValue : null
+				Name = arg.Name, Type = arg.ParameterType, IsOptional = arg.IsOptional, DefaultValue = arg.IsOptional ? arg.DefaultValue : null
 			};
 
 			var attrsCustom = new List<Attribute>();
 			var attrs = arg.GetCustomAttributes();
 			var isParams = false;
 			foreach (var xa in attrs)
-			{
 				switch (xa)
 				{
 					case DescriptionAttribute d:
@@ -119,7 +115,6 @@ private CommandOverloadBuilder(MethodInfo method, object target)
 						attrsCustom.Add(xa);
 						break;
 				}
-			}
 
 			if (i > 2 && !ca.IsOptional && !ca.IsCatchAll && args[i - 3].IsOptional)
 				throw new InvalidOverloadException("Non-optional argument cannot appear after an optional one", method, arg);
@@ -160,10 +155,7 @@ internal CommandOverload Build()
 	{
 		var ovl = new CommandOverload()
 		{
-			Arguments = this.Arguments,
-			Priority = this.Priority,
-			Callable = this.Callable,
-			InvocationTarget = this._invocationTarget
+			Arguments = this.Arguments, Priority = this.Priority, Callable = this.Callable, InvocationTarget = this._invocationTarget
 		};
 
 		return ovl;
diff --git a/DisCatSharp.CommandsNext/Entities/Command.cs b/DisCatSharp.CommandsNext/Entities/Command.cs
index 00671a60e0..b4fd12ce93 100644
--- a/DisCatSharp.CommandsNext/Entities/Command.cs
+++ b/DisCatSharp.CommandsNext/Entities/Command.cs
@@ -98,10 +98,9 @@ public virtual async Task<CommandResult> ExecuteAsync(CommandContext ctx)
 				var ret = (Task)ovl.Callable.DynamicInvoke(args.Converted);
 				await ret.ConfigureAwait(false);
 				executed = true;
-				res = new CommandResult
+				res = new()
 				{
-					IsSuccessful = true,
-					Context = ctx
+					IsSuccessful = true, Context = ctx
 				};
 
 				if (mdl is BaseCommandModule bcmAfter)
@@ -114,11 +113,9 @@ public virtual async Task<CommandResult> ExecuteAsync(CommandContext ctx)
 		}
 		catch (Exception ex)
 		{
-			res = new CommandResult
+			res = new()
 			{
-				IsSuccessful = false,
-				Exception = ex,
-				Context = ctx
+				IsSuccessful = false, Exception = ex, Context = ctx
 			};
 		}
 
@@ -190,7 +187,7 @@ public override bool Equals(object obj)
 			return true;
 
 		return obj is Command cmd
-&& cmd.QualifiedName == this.QualifiedName;
+		       && cmd.QualifiedName == this.QualifiedName;
 	}
 
 	/// <summary>
diff --git a/DisCatSharp.CommandsNext/Entities/CommandGroup.cs b/DisCatSharp.CommandsNext/Entities/CommandGroup.cs
index b5c45a3b54..9df86e8706 100644
--- a/DisCatSharp.CommandsNext/Entities/CommandGroup.cs
+++ b/DisCatSharp.CommandsNext/Entities/CommandGroup.cs
@@ -40,8 +40,8 @@ public override async Task<CommandResult> ExecuteAsync(CommandContext ctx)
 		if (cn != null)
 		{
 			var cmd = ctx.Config.CaseSensitive
-				? this.Children.FirstOrDefault(xc => xc.Name == cn || (xc.Aliases != null && xc.Aliases.Contains(cn)))
-				: this.Children.FirstOrDefault(xc => xc.Name.ToLowerInvariant() == cn.ToLowerInvariant() || (xc.Aliases != null && xc.Aliases.Select(xs => xs.ToLowerInvariant()).Contains(cn.ToLowerInvariant())));
+				? this.Children.FirstOrDefault(xc => xc.Name == cn || xc.Aliases != null && xc.Aliases.Contains(cn))
+				: this.Children.FirstOrDefault(xc => xc.Name.ToLowerInvariant() == cn.ToLowerInvariant() || xc.Aliases != null && xc.Aliases.Select(xs => xs.ToLowerInvariant()).Contains(cn.ToLowerInvariant()));
 			if (cmd != null)
 			{
 				// pass the execution on
@@ -59,22 +59,18 @@ public override async Task<CommandResult> ExecuteAsync(CommandContext ctx)
 
 				var fchecks = await cmd.RunChecksAsync(xctx, false).ConfigureAwait(false);
 				return fchecks.Any()
-					? new CommandResult
+					? new()
 					{
-						IsSuccessful = false,
-						Exception = new ChecksFailedException(cmd, xctx, fchecks),
-						Context = xctx
+						IsSuccessful = false, Exception = new ChecksFailedException(cmd, xctx, fchecks), Context = xctx
 					}
 					: await cmd.ExecuteAsync(xctx).ConfigureAwait(false);
 			}
 		}
 
 		return !this.IsExecutableWithoutSubcommands
-			? new CommandResult
+			? new()
 			{
-				IsSuccessful = false,
-				Exception = new InvalidOperationException("No matching subcommands were found, and this group is not executable."),
-				Context = ctx
+				IsSuccessful = false, Exception = new InvalidOperationException("No matching subcommands were found, and this group is not executable."), Context = ctx
 			}
 			: await base.ExecuteAsync(ctx).ConfigureAwait(false);
 	}
diff --git a/DisCatSharp.CommandsNext/EventArgs/CommandContext.cs b/DisCatSharp.CommandsNext/EventArgs/CommandContext.cs
index 7478846cbd..1d4fa6bb04 100644
--- a/DisCatSharp.CommandsNext/EventArgs/CommandContext.cs
+++ b/DisCatSharp.CommandsNext/EventArgs/CommandContext.cs
@@ -99,7 +99,7 @@ public DiscordMember Member
 	/// </summary>
 	internal CommandContext()
 	{
-		this._lazyMember = new Lazy<DiscordMember>(() => this.Guild != null && this.Guild.Members.TryGetValue(this.User.Id, out var member) ? member : this.Guild?.GetMemberAsync(this.User.Id).ConfigureAwait(false).GetAwaiter().GetResult());
+		this._lazyMember = new(() => this.Guild != null && this.Guild.Members.TryGetValue(this.User.Id, out var member) ? member : this.Guild?.GetMemberAsync(this.User.Id).ConfigureAwait(false).GetAwaiter().GetResult());
 	}
 
 	/// <summary>
@@ -156,10 +156,12 @@ public Task TriggerTypingAsync()
 		/// Gets the provider.
 		/// </summary>
 		public IServiceProvider Provider { get; }
+
 		/// <summary>
 		/// Gets the scope.
 		/// </summary>
 		public IServiceScope Scope { get; }
+
 		/// <summary>
 		/// Gets a value indicating whether is initialized.
 		/// </summary>
diff --git a/DisCatSharp.CommandsNext/ExtensionMethods.cs b/DisCatSharp.CommandsNext/ExtensionMethods.cs
index 1e9bcac1b5..43a873c267 100644
--- a/DisCatSharp.CommandsNext/ExtensionMethods.cs
+++ b/DisCatSharp.CommandsNext/ExtensionMethods.cs
@@ -73,7 +73,6 @@ public static async Task<IReadOnlyDictionary<int, CommandsNextExtension>> UseCom
 	public static CommandsNextExtension GetCommandsNext(this DiscordClient client)
 		=> client.GetExtension<CommandsNextExtension>();
 
-
 	/// <summary>
 	/// Gets the active CommandsNext modules for all shards in this client.
 	/// </summary>
@@ -85,9 +84,7 @@ public static async Task<IReadOnlyDictionary<int, CommandsNextExtension>> GetCom
 		var extensions = new Dictionary<int, CommandsNextExtension>();
 
 		foreach (var shard in client.ShardClients.Select(xkvp => xkvp.Value))
-		{
 			extensions.Add(shard.ShardId, shard.GetExtension<CommandsNextExtension>());
-		}
 
 		return new ReadOnlyDictionary<int, CommandsNextExtension>(extensions);
 	}
@@ -102,6 +99,7 @@ public static void RegisterCommands(this IReadOnlyDictionary<int, CommandsNextEx
 		foreach (var extension in extensions.Values)
 			extension.RegisterCommands(assembly);
 	}
+
 	/// <summary>
 	/// Registers all commands from a given command class.
 	/// </summary>
@@ -112,6 +110,7 @@ public static void RegisterCommands<T>(this IReadOnlyDictionary<int, CommandsNex
 		foreach (var extension in extensions.Values)
 			extension.RegisterCommands<T>();
 	}
+
 	/// <summary>
 	/// Registers all commands from a given command class.
 	/// </summary>
@@ -122,6 +121,7 @@ public static void RegisterCommands(this IReadOnlyDictionary<int, CommandsNextEx
 		foreach (var extension in extensions.Values)
 			extension.RegisterCommands(t);
 	}
+
 	/// <summary>
 	/// Builds and registers all supplied commands.
 	/// </summary>
diff --git a/DisCatSharp.Common/Attributes/DateTimeFormatAttribute.cs b/DisCatSharp.Common/Attributes/DateTimeFormatAttribute.cs
index 0cdffabec4..9653a929c3 100644
--- a/DisCatSharp.Common/Attributes/DateTimeFormatAttribute.cs
+++ b/DisCatSharp.Common/Attributes/DateTimeFormatAttribute.cs
@@ -1,4 +1,5 @@
 using System;
+
 // ReSharper disable InconsistentNaming
 
 namespace DisCatSharp.Common.Serialization;
diff --git a/DisCatSharp.Common/Attributes/IncludeNullAttribute.cs b/DisCatSharp.Common/Attributes/IncludeNullAttribute.cs
index 331fa07a7f..e64b327604 100644
--- a/DisCatSharp.Common/Attributes/IncludeNullAttribute.cs
+++ b/DisCatSharp.Common/Attributes/IncludeNullAttribute.cs
@@ -6,7 +6,6 @@ namespace DisCatSharp.Common.Serialization;
 /// <para>Specifies that if the value of the field or property is null, it should be included in the serialized data.</para>
 /// <para>This alters the default behaviour of ignoring nulls.</para>
 /// </summary>
-[Obsolete("Use [DataMember] with EmitDefaultValue = true.")]
-[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+[Obsolete("Use [DataMember] with EmitDefaultValue = true."), AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
 public sealed class IncludeNullAttribute : SerializationAttribute
 { }
diff --git a/DisCatSharp.Common/Attributes/SerializedNameAttribute.cs b/DisCatSharp.Common/Attributes/SerializedNameAttribute.cs
index c1cc041338..71817a5ff4 100644
--- a/DisCatSharp.Common/Attributes/SerializedNameAttribute.cs
+++ b/DisCatSharp.Common/Attributes/SerializedNameAttribute.cs
@@ -5,8 +5,7 @@ namespace DisCatSharp.Common.Serialization;
 /// <summary>
 /// Declares name of a property in serialized data. This is used for mapping serialized data to object properties and fields.
 /// </summary>
-[Obsolete("Use [DataMember] with set Name instead.")]
-[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+[Obsolete("Use [DataMember] with set Name instead."), AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
 public sealed class SerializedNameAttribute : SerializationAttribute
 {
 	/// <summary>
diff --git a/DisCatSharp.Common/Attributes/TimeSpanFormatAttribute.cs b/DisCatSharp.Common/Attributes/TimeSpanFormatAttribute.cs
index 9f29478a9b..c25e71591f 100644
--- a/DisCatSharp.Common/Attributes/TimeSpanFormatAttribute.cs
+++ b/DisCatSharp.Common/Attributes/TimeSpanFormatAttribute.cs
@@ -1,4 +1,5 @@
 using System;
+
 // ReSharper disable InconsistentNaming
 
 namespace DisCatSharp.Common.Serialization;
diff --git a/DisCatSharp.Common/DisCatSharp.Common.csproj b/DisCatSharp.Common/DisCatSharp.Common.csproj
index 3c730aa47d..60169d2f29 100644
--- a/DisCatSharp.Common/DisCatSharp.Common.csproj
+++ b/DisCatSharp.Common/DisCatSharp.Common.csproj
@@ -1,56 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../DisCatSharp.Targets/Version.targets" />
-  <Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
-  <Import Project="../DisCatSharp.Targets/NuGet.targets" />
-  <Import Project="../DisCatSharp.Targets/Library.targets" />
-  <Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
-
-  <PropertyGroup>
-    <AssemblyName>DisCatSharp.Common</AssemblyName>
-    <RootNamespace>DisCatSharp.Common</RootNamespace>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <Optimize>True</Optimize>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DebugType>Portable</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <PackageId>DisCatSharp.Common</PackageId>
-	<Description>
-DisCatSharp Common Extension
-
-Common tools for DisCatSharp, like regexes and converters!
-	</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Common Tools</PackageTags>
-    <Nullable>annotations</Nullable>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <Optimize>False</Optimize>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>1701;1702;DV2001</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <NoWarn>1701;1702;DV2001</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
-    <PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
-    <PackageReference Include="System.Memory" Version="4.5.5" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-  </ItemGroup>
+	<Import Project="../DisCatSharp.Targets/Version.targets" />
+	<Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
+	<Import Project="../DisCatSharp.Targets/NuGet.targets" />
+	<Import Project="../DisCatSharp.Targets/Library.targets" />
+	<Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
+
+	<PropertyGroup>
+		<AssemblyName>DisCatSharp.Common</AssemblyName>
+		<RootNamespace>DisCatSharp.Common</RootNamespace>
+		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+		<Optimize>True</Optimize>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DebugType>Portable</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<PackageId>DisCatSharp.Common</PackageId>
+		<Description>
+			DisCatSharp Common Extension
+
+			Common tools for DisCatSharp, like regexes and converters!
+		</Description>
+		<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Common Tools</PackageTags>
+		<Nullable>annotations</Nullable>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+		<Optimize>False</Optimize>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<NoWarn>1701;1702;DV2001</NoWarn>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<NoWarn>1701;1702;DV2001</NoWarn>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
+		<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+		<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
+		<PackageReference Include="System.Memory" Version="4.5.5" />
+		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+		<PackageReference Include="System.ValueTuple" Version="4.5.0" />
+	</ItemGroup>
 
 </Project>
diff --git a/DisCatSharp.Common/Types/CharSpanLookupDictionary.cs b/DisCatSharp.Common/Types/CharSpanLookupDictionary.cs
index e00188a4aa..4087dac105 100644
--- a/DisCatSharp.Common/Types/CharSpanLookupDictionary.cs
+++ b/DisCatSharp.Common/Types/CharSpanLookupDictionary.cs
@@ -18,10 +18,12 @@ public sealed class CharSpanLookupDictionary<TValue> :
 	/// Gets the collection of all keys present in this dictionary.
 	/// </summary>
 	public IEnumerable<string> Keys => this.GetKeysInternal();
+
 	/// <summary>
 	/// Gets the keys.
 	/// </summary>
 	ICollection<string> IDictionary<string, TValue>.Keys => this.GetKeysInternal();
+
 	/// <summary>
 	/// Gets the keys.
 	/// </summary>
@@ -31,10 +33,12 @@ public sealed class CharSpanLookupDictionary<TValue> :
 	/// Gets the collection of all values present in this dictionary.
 	/// </summary>
 	public IEnumerable<TValue> Values => this.GetValuesInternal();
+
 	/// <summary>
 	/// Gets the values.
 	/// </summary>
 	ICollection<TValue> IDictionary<string, TValue>.Values => this.GetValuesInternal();
+
 	/// <summary>
 	/// Gets the values.
 	/// </summary>
@@ -112,7 +116,7 @@ public TValue this[ReadOnlySpan<char> key]
 			unsafe
 			{
 				fixed (char* chars = &key.GetPinnableReference())
-					this.TryInsertInternal(new string(chars, 0, key.Length), value, true);
+					this.TryInsertInternal(new(chars, 0, key.Length), value, true);
 			}
 		}
 	}
@@ -156,7 +160,7 @@ object IDictionary.this[object key]
 	/// </summary>
 	public CharSpanLookupDictionary()
 	{
-		this._internalBuckets = new Dictionary<ulong, KeyedValue>();
+		this._internalBuckets = new();
 	}
 
 	/// <summary>
@@ -165,7 +169,7 @@ public CharSpanLookupDictionary()
 	/// <param name="initialCapacity">Initial capacity of the dictionary.</param>
 	public CharSpanLookupDictionary(int initialCapacity)
 	{
-		this._internalBuckets = new Dictionary<ulong, KeyedValue>(initialCapacity);
+		this._internalBuckets = new(initialCapacity);
 	}
 
 	/// <summary>
@@ -184,7 +188,7 @@ public CharSpanLookupDictionary(IDictionary<string, TValue> values)
 	/// </summary>
 	/// <param name="values">Dictionary containing items to populate this dictionary with.</param>
 	public CharSpanLookupDictionary(IReadOnlyDictionary<string, TValue> values)
-		 : this(values.Count)
+		: this(values.Count)
 	{
 		foreach (var (k, v) in values)
 			this.Add(k, v);
@@ -222,7 +226,7 @@ public void Add(ReadOnlySpan<char> key, TValue value)
 		unsafe
 		{
 			fixed (char* chars = &key.GetPinnableReference())
-				if (!this.TryInsertInternal(new string(chars, 0, key.Length), value, false))
+				if (!this.TryInsertInternal(new(chars, 0, key.Length), value, false))
 					throw new ArgumentException("Given key is already present in the dictionary.", nameof(key));
 		}
 	}
@@ -247,7 +251,7 @@ public bool TryAdd(ReadOnlySpan<char> key, TValue value)
 		unsafe
 		{
 			fixed (char* chars = &key.GetPinnableReference())
-				return this.TryInsertInternal(new string(chars, 0, key.Length), value, false);
+				return this.TryInsertInternal(new(chars, 0, key.Length), value, false);
 		}
 	}
 
@@ -428,7 +432,7 @@ void ICollection<KeyValuePair<string, TValue>>.CopyTo(KeyValuePair<string, TValu
 			var kdv = v;
 			while (kdv != null)
 			{
-				array[i++] = new KeyValuePair<string, TValue>(kdv.Key, kdv.Value);
+				array[i++] = new(kdv.Key, kdv.Value);
 				kdv = kdv.Next;
 			}
 		}
@@ -484,7 +488,7 @@ private bool TryInsertInternal(string key, TValue value, bool replace)
 		var hash = key.CalculateKnuthHash();
 		if (!this._internalBuckets.ContainsKey(hash))
 		{
-			this._internalBuckets.Add(hash, new KeyedValue(key, hash, value));
+			this._internalBuckets.Add(hash, new(key, hash, value));
 			this.Count++;
 			return true;
 		}
@@ -506,7 +510,7 @@ private bool TryInsertInternal(string key, TValue value, bool replace)
 			kdv = kdv.Next;
 		}
 
-		kdvLast.Next = new KeyedValue(key, hash, value);
+		kdvLast.Next = new(key, hash, value);
 		this.Count++;
 		return true;
 	}
@@ -526,13 +530,11 @@ private bool TryRetrieveInternal(ReadOnlySpan<char> key, out TValue value)
 			return false;
 
 		while (kdv != null)
-		{
 			if (key.SequenceEqual(kdv.Key.AsSpan()))
 			{
 				value = kdv.Value;
 				return true;
 			}
-		}
 
 		return false;
 	}
@@ -561,11 +563,8 @@ private bool TryRemoveInternal(ReadOnlySpan<char> key, out TValue value)
 			return true;
 		}
 		else if (kdv.Next == null)
-		{
 			// Only bucket under this hash and key does not match, cannot remove
-
 			return false;
-		}
 		else if (key.SequenceEqual(kdv.Key.AsSpan()))
 		{
 			// First key in the bucket matches, pop it and set its child as current bucket
@@ -668,10 +667,12 @@ private class KeyedValue
 		/// Gets the key hash.
 		/// </summary>
 		public ulong KeyHash { get; }
+
 		/// <summary>
 		/// Gets the key.
 		/// </summary>
 		public string Key { get; }
+
 		/// <summary>
 		/// Gets or sets the value.
 		/// </summary>
@@ -707,18 +708,22 @@ private class Enumerator :
 		/// Gets the current.
 		/// </summary>
 		public KeyValuePair<string, TValue> Current { get; private set; }
+
 		/// <summary>
 		/// Gets the current.
 		/// </summary>
 		object IEnumerator.Current => this.Current;
+
 		/// <summary>
 		/// Gets the key.
 		/// </summary>
 		object IDictionaryEnumerator.Key => this.Current.Key;
+
 		/// <summary>
 		/// Gets the value.
 		/// </summary>
 		object IDictionaryEnumerator.Value => this.Current.Value;
+
 		/// <summary>
 		/// Gets the entry.
 		/// </summary>
@@ -762,13 +767,13 @@ public bool MoveNext()
 					return false;
 
 				kdv = this._internalEnumerator.Current.Value;
-				this.Current = new KeyValuePair<string, TValue>(kdv.Key, kdv.Value);
+				this.Current = new(kdv.Key, kdv.Value);
 
 				this._currentValue = kdv.Next;
 				return true;
 			}
 
-			this.Current = new KeyValuePair<string, TValue>(kdv.Key, kdv.Value);
+			this.Current = new(kdv.Key, kdv.Value);
 			this._currentValue = kdv.Next;
 			return true;
 		}
diff --git a/DisCatSharp.Common/Types/CharSpanLookupReadOnlyDictionary.cs b/DisCatSharp.Common/Types/CharSpanLookupReadOnlyDictionary.cs
index 0314a0959f..1258f30f01 100644
--- a/DisCatSharp.Common/Types/CharSpanLookupReadOnlyDictionary.cs
+++ b/DisCatSharp.Common/Types/CharSpanLookupReadOnlyDictionary.cs
@@ -91,6 +91,7 @@ public CharSpanLookupReadOnlyDictionary(IEnumerable<KeyValuePair<string, TValue>
 	{
 		if (values == null!)
 			throw new ArgumentNullException(nameof(values));
+
 		this._internalBuckets = PrepareItems(values, out var count);
 		this.Count = count;
 	}
@@ -163,13 +164,11 @@ private bool TryRetrieveInternal(ReadOnlySpan<char> key, out TValue value)
 			return false;
 
 		while (kdv != null)
-		{
 			if (key.SequenceEqual(kdv.Key.AsSpan()))
 			{
 				value = kdv.Value;
 				return true;
 			}
-		}
 
 		return false;
 	}
@@ -254,7 +253,7 @@ private static IReadOnlyDictionary<ulong, KeyedValue> PrepareItems(IEnumerable<K
 			var hash = k.CalculateKnuthHash();
 			if (!dict.ContainsKey(hash))
 			{
-				dict.Add(hash, new KeyedValue(k, hash, v));
+				dict.Add(hash, new(k, hash, v));
 				count++;
 				continue;
 			}
@@ -270,7 +269,7 @@ private static IReadOnlyDictionary<ulong, KeyedValue> PrepareItems(IEnumerable<K
 				kdv = kdv.Next;
 			}
 
-			kdvLast.Next = new KeyedValue(k, hash, v);
+			kdvLast.Next = new(k, hash, v);
 			count++;
 		}
 
@@ -286,10 +285,12 @@ private class KeyedValue
 		/// Gets the key hash.
 		/// </summary>
 		public ulong KeyHash { get; }
+
 		/// <summary>
 		/// Gets the key.
 		/// </summary>
 		public string Key { get; }
+
 		/// <summary>
 		/// Gets or sets the value.
 		/// </summary>
@@ -323,6 +324,7 @@ private class Enumerator : IEnumerator<KeyValuePair<string, TValue>>
 		/// Gets the current.
 		/// </summary>
 		public KeyValuePair<string, TValue> Current { get; private set; }
+
 		/// <summary>
 		/// Gets the current.
 		/// </summary>
@@ -366,13 +368,13 @@ public bool MoveNext()
 					return false;
 
 				kdv = this._internalEnumerator.Current.Value;
-				this.Current = new KeyValuePair<string, TValue>(kdv.Key, kdv.Value);
+				this.Current = new(kdv.Key, kdv.Value);
 
 				this._currentValue = kdv.Next;
 				return true;
 			}
 
-			this.Current = new KeyValuePair<string, TValue>(kdv.Key, kdv.Value);
+			this.Current = new(kdv.Key, kdv.Value);
 			this._currentValue = kdv.Next;
 			return true;
 		}
diff --git a/DisCatSharp.Common/Types/ContinuousMemoryBuffer.cs b/DisCatSharp.Common/Types/ContinuousMemoryBuffer.cs
index 201b256a89..2ed9e6e13f 100644
--- a/DisCatSharp.Common/Types/ContinuousMemoryBuffer.cs
+++ b/DisCatSharp.Common/Types/ContinuousMemoryBuffer.cs
@@ -139,7 +139,7 @@ public bool Read(Span<T> destination, ulong source, out int itemsWritten)
 			throw new ArgumentOutOfRangeException(nameof(source), "Cannot copy data from beyond the buffer.");
 
 		var start = (int)source;
-		var sbuff = this._buff[start..this._pos ].Span;
+		var sbuff = this._buff[start..this._pos].Span;
 		var dbuff = MemoryMarshal.AsBytes(destination);
 		if (sbuff.Length > dbuff.Length)
 			sbuff = sbuff[..dbuff.Length];
diff --git a/DisCatSharp.Common/Types/Serialization/ComplexDecomposer.cs b/DisCatSharp.Common/Types/Serialization/ComplexDecomposer.cs
index 13d9945286..ef9ea5035b 100644
--- a/DisCatSharp.Common/Types/Serialization/ComplexDecomposer.cs
+++ b/DisCatSharp.Common/Types/Serialization/ComplexDecomposer.cs
@@ -13,18 +13,22 @@ public sealed class ComplexDecomposer : IDecomposer
 	/// Gets the t complex.
 	/// </summary>
 	private static Type s_complex { get; } = typeof(Complex);
+
 	/// <summary>
 	/// Gets the t double array.
 	/// </summary>
 	private static Type s_doubleArray { get; } = typeof(double[]);
+
 	/// <summary>
 	/// Gets the t double enumerable.
 	/// </summary>
 	private static Type s_doubleEnumerable { get; } = typeof(IEnumerable<double>);
+
 	/// <summary>
 	/// Gets the t object array.
 	/// </summary>
 	private static Type s_objectArray { get; } = typeof(object[]);
+
 	/// <summary>
 	/// Gets the t object enumerable.
 	/// </summary>
@@ -37,9 +41,9 @@ public bool CanDecompose(Type t)
 	/// <inheritdoc />
 	public bool CanRecompose(Type t)
 		=> t == s_doubleArray
-		|| t == s_objectArray
-		|| s_doubleEnumerable.IsAssignableFrom(t)
-		|| s_objectEnumerable.IsAssignableFrom(t);
+		   || t == s_objectArray
+		   || s_doubleEnumerable.IsAssignableFrom(t)
+		   || s_objectEnumerable.IsAssignableFrom(t);
 
 	/// <inheritdoc />
 	public bool TryDecompose(object obj, Type tobj, out object decomposed, out Type tdecomposed)
@@ -50,7 +54,10 @@ public bool TryDecompose(object obj, Type tobj, out object decomposed, out Type
 		if (tobj != s_complex || obj is not Complex c)
 			return false;
 
-		decomposed = new[] { c.Real, c.Imaginary };
+		decomposed = new[]
+		{
+			c.Real, c.Imaginary
+		};
 		return true;
 	}
 
diff --git a/DisCatSharp.Common/Utilities/AsyncEvent/AsyncEvent.cs b/DisCatSharp.Common/Utilities/AsyncEvent/AsyncEvent.cs
index 8c4d5c937c..16723a0fa0 100644
--- a/DisCatSharp.Common/Utilities/AsyncEvent/AsyncEvent.cs
+++ b/DisCatSharp.Common/Utilities/AsyncEvent/AsyncEvent.cs
@@ -106,12 +106,11 @@ public async Task InvokeAsync(TSender sender, TArgs e, AsyncEventExceptionMode e
 		// Collect exceptions
 		List<Exception> exceptions = null;
 		if ((exceptionMode & AsyncEventExceptionMode.ThrowAll) != 0)
-			exceptions = new List<Exception>(handlers.Length * 2 /* timeout + regular */);
+			exceptions = new(handlers.Length * 2 /* timeout + regular */);
 
 		// If we have a timeout configured, start the timeout task
 		var timeout = this.MaximumExecutionTime > TimeSpan.Zero ? Task.Delay(this.MaximumExecutionTime) : null;
 		foreach (var handler in handlers)
-		{
 			try
 			{
 				// Start the handler execution
@@ -120,7 +119,6 @@ public async Task InvokeAsync(TSender sender, TArgs e, AsyncEventExceptionMode e
 				{
 					// If timeout is configured, wait for any task to finish
 					// If the timeout task finishes first, the handler is causing a timeout
-
 					var result = await Task.WhenAny(timeout, handlerTask).ConfigureAwait(false);
 					if (result == timeout)
 					{
@@ -138,10 +136,8 @@ public async Task InvokeAsync(TSender sender, TArgs e, AsyncEventExceptionMode e
 					}
 				}
 				else if (handlerTask != null)
-				{
 					// No timeout is configured, or timeout already expired, proceed as usual
 					await handlerTask.ConfigureAwait(false);
-				}
 
 				if (e.Handled)
 					break;
@@ -156,7 +152,6 @@ public async Task InvokeAsync(TSender sender, TArgs e, AsyncEventExceptionMode e
 				if ((exceptionMode & AsyncEventExceptionMode.ThrowFatal) == AsyncEventExceptionMode.ThrowFatal)
 					exceptions.Add(ex);
 			}
-		}
 
 		if ((exceptionMode & AsyncEventExceptionMode.ThrowAll) != 0 && exceptions.Count > 0)
 			throw new AggregateException("Exceptions were thrown during execution of the event's handlers.", exceptions);
diff --git a/DisCatSharp.Common/Utilities/AsyncExecutor.cs b/DisCatSharp.Common/Utilities/AsyncExecutor.cs
index 06f8d3084b..abada79a6b 100644
--- a/DisCatSharp.Common/Utilities/AsyncExecutor.cs
+++ b/DisCatSharp.Common/Utilities/AsyncExecutor.cs
@@ -22,7 +22,7 @@ public AsyncExecutor()
 	public void Execute(Task task)
 	{
 		// create state object
-		var taskState = new StateRef<object>(new AutoResetEvent(false));
+		var taskState = new StateRef<object>(new(false));
 
 		// queue a task and wait for it to finish executing
 		task.ContinueWith(TaskCompletionHandler, taskState);
@@ -47,9 +47,7 @@ void TaskCompletionHandler(Task t, object state)
 					stateRef.Exception = t.Exception;
 			}
 			else if (t.IsCanceled)
-			{
 				stateRef.Exception = new TaskCanceledException(t);
-			}
 
 			// signal that the execution is done
 			stateRef.Lock.Set();
@@ -65,7 +63,7 @@ void TaskCompletionHandler(Task t, object state)
 	public T Execute<T>(Task<T> task)
 	{
 		// create state object
-		var taskState = new StateRef<T>(new AutoResetEvent(false));
+		var taskState = new StateRef<T>(new(false));
 
 		// queue a task and wait for it to finish executing
 		task.ContinueWith(TaskCompletionHandler, taskState);
@@ -80,7 +78,7 @@ public T Execute<T>(Task<T> task)
 			return taskState.Result;
 
 		// throw exception if no result
-		throw new Exception("Task returned no result.");
+		throw new("Task returned no result.");
 
 		// completion method
 		void TaskCompletionHandler(Task<T> t, object state)
@@ -97,9 +95,7 @@ void TaskCompletionHandler(Task<T> t, object state)
 					stateRef.Exception = t.Exception;
 			}
 			else if (t.IsCanceled)
-			{
 				stateRef.Exception = new TaskCanceledException(t);
-			}
 
 			// return the result from the task, if any
 			if (t.IsCompleted && !t.IsFaulted)
diff --git a/DisCatSharp.Common/Utilities/AsyncManualResetEvent.cs b/DisCatSharp.Common/Utilities/AsyncManualResetEvent.cs
index b955604c57..396b1c7506 100644
--- a/DisCatSharp.Common/Utilities/AsyncManualResetEvent.cs
+++ b/DisCatSharp.Common/Utilities/AsyncManualResetEvent.cs
@@ -21,7 +21,7 @@ public sealed class AsyncManualResetEvent
 	/// <param name="initialState">Initial state of this event.</param>
 	public AsyncManualResetEvent(bool initialState)
 	{
-		this._resetTcs = new TaskCompletionSource<bool>();
+		this._resetTcs = new();
 		if (initialState)
 			this._resetTcs.TrySetResult(initialState);
 	}
@@ -51,7 +51,7 @@ public void Reset()
 		while (true)
 		{
 			var tcs = this._resetTcs;
-			if (!tcs.Task.IsCompleted || Interlocked.CompareExchange(ref this._resetTcs, new TaskCompletionSource<bool>(), tcs) == tcs)
+			if (!tcs.Task.IsCompleted || Interlocked.CompareExchange(ref this._resetTcs, new(), tcs) == tcs)
 				return;
 		}
 	}
diff --git a/DisCatSharp.Common/Utilities/Extensions.cs b/DisCatSharp.Common/Utilities/Extensions.cs
index 18c28e7ac1..8c7b133284 100644
--- a/DisCatSharp.Common/Utilities/Extensions.cs
+++ b/DisCatSharp.Common/Utilities/Extensions.cs
@@ -305,7 +305,7 @@ public static bool IsInRange(this double num, double min, double max, bool inclu
 	/// <returns>Whether the character is in basic alphanumeric character range.</returns>
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static bool IsBasicAlphanumeric(this char c)
-		=> (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9');
+		=> c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9';
 
 	/// <summary>
 	/// Returns whether supplied character is in the 0-9 range.
@@ -323,7 +323,7 @@ public static bool IsBasicDigit(this char c)
 	/// <returns>Whether the character is in basic letter character range.</returns>
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static bool IsBasicLetter(this char c)
-		=> (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+		=> c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z';
 
 	/// <summary>
 	/// Tests whether given string ends with given character.
@@ -452,7 +452,6 @@ internal static bool TryFirstTwo<T>(this IEnumerable<T> enumerable, out (T first
 		if (!enumerator.MoveNext())
 			return false;
 
-
 		values = (first, enumerator.Current);
 		return true;
 	}
@@ -481,13 +480,11 @@ private static ulong Knuth(ReadOnlySpan<char> chars)
 	internal static bool RemoveFirst<T>(this IList<T> list, Predicate<T> predicate)
 	{
 		for (var i = 0; i < list.Count; i++)
-		{
 			if (predicate(list[i]))
 			{
 				list.RemoveAt(i);
 				return true;
 			}
-		}
 
 		return false;
 	}
@@ -501,8 +498,6 @@ internal static bool RemoveFirst<T>(this IList<T> list, Predicate<T> predicate)
 	internal static void Populate<T>(this T[] arr, T value)
 	{
 		for (var i = 0; i < arr.Length; i++)
-		{
 			arr[i] = value;
-		}
 	}
 }
diff --git a/DisCatSharp.Common/Utilities/RuntimeInformation.cs b/DisCatSharp.Common/Utilities/RuntimeInformation.cs
index d40138f6a9..765a1e2ef0 100644
--- a/DisCatSharp.Common/Utilities/RuntimeInformation.cs
+++ b/DisCatSharp.Common/Utilities/RuntimeInformation.cs
@@ -22,7 +22,10 @@ public static class RuntimeInformation
 	static RuntimeInformation()
 	{
 		var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
-		var mscorlib = loadedAssemblies.Select(x => new { Assembly = x, AssemblyName = x.GetName() })
+		var mscorlib = loadedAssemblies.Select(x => new
+			{
+				Assembly = x, AssemblyName = x.GetName()
+			})
 			.FirstOrDefault(x => x.AssemblyName.Name == "mscorlib" || x.AssemblyName.Name == "System.Private.CoreLib");
 
 		var location = mscorlib.Assembly.Location;
diff --git a/DisCatSharp.Configuration.Tests/ConfigurationExtensionTests.cs b/DisCatSharp.Configuration.Tests/ConfigurationExtensionTests.cs
index 99ec6fb2fa..9e44095bfd 100644
--- a/DisCatSharp.Configuration.Tests/ConfigurationExtensionTests.cs
+++ b/DisCatSharp.Configuration.Tests/ConfigurationExtensionTests.cs
@@ -14,26 +14,41 @@ namespace DisCatSharp.Configuration.Tests;
 
 public class ConfigurationExtensionTests
 {
-	#region Test Classes
-	class SampleClass
+#region Test Classes
+
+	private class SampleClass
 	{
 		public int Amount { get; set; }
 		public string? Email { get; set; }
 	}
 
-	class ClassWithArray
+	private class ClassWithArray
 	{
-		public int[] Values { get; set; } = { 1, 2, 3, 4, 5 };
-		public string[] Strings { get; set; } = { "1", "2", "3", "4", "5" };
+		public int[] Values { get; set; } =
+		{
+			1, 2, 3, 4, 5
+		};
+
+		public string[] Strings { get; set; } =
+		{
+			"1", "2", "3", "4", "5"
+		};
 	}
 
-	class ClassWithEnumerable
+	private class ClassWithEnumerable
 	{
-		public IEnumerable<int> Values { get; set; } = new[] { 1, 2, 3, 4, 5 };
-		public IEnumerable<string> Strings { get; set; } = new[] { "1", "2", "3", "4", "5" };
+		public IEnumerable<int> Values { get; set; } = new[]
+		{
+			1, 2, 3, 4, 5
+		};
+
+		public IEnumerable<string> Strings { get; set; } = new[]
+		{
+			"1", "2", "3", "4", "5"
+		};
 	}
 
-	class ClassWithList
+	private class ClassWithList
 	{
 		public List<string> Strings { get; set; } = new()
 		{
@@ -54,17 +69,19 @@ class ClassWithList
 		};
 	}
 
-	class SampleClass2
+	private class SampleClass2
 	{
 		public TimeSpan Timeout { get; set; } = TimeSpan.FromMinutes(7);
 		public string Name { get; set; } = "Sample";
 		public string ConstructorValue { get; }
+
 		public SampleClass2(string value)
 		{
 			this.ConstructorValue = value;
 		}
 	}
-	#endregion
+
+#endregion
 
 	private IConfiguration EnumerableTestConfiguration() =>
 		new ConfigurationBuilder()
@@ -86,8 +103,8 @@ private IConfiguration HasSectionNoSuffixConfiguration() =>
 		.Build();
 
 	private IConfiguration DiscordIntentsConfig() => new ConfigurationBuilder()
-			.AddJsonFile("intents-discord.json")
-			.Build();
+		.AddJsonFile("intents-discord.json")
+		.Build();
 
 	private IConfiguration DiscordHaphazardConfig() => new ConfigurationBuilder()
 		.AddJsonFile("haphazard-discord.json")
@@ -97,44 +114,63 @@ private IConfiguration HasSectionNoSuffixConfiguration() =>
 	private IConfiguration SampleConfig() => new ConfigurationBuilder()
 		.AddInMemoryCollection(new Dictionary<string, string>
 		{
-			{ "Sample:Amount", "200" },
-			{ "Sample:Email", "test@gmail.com" }
+			{
+				"Sample:Amount", "200"
+			},
+			{
+				"Sample:Email", "test@gmail.com"
+			}
 		})
 		.Build();
 
 	private IConfiguration SampleClass2Configuration_Default() => new ConfigurationBuilder()
 		.AddInMemoryCollection(new Dictionary<string, string>
 		{
-			{"Random:Stuff", "Meow"},
-			{"SampleClass2:Name", "Purfection"}
+			{
+				"Random:Stuff", "Meow"
+			},
+			{
+				"SampleClass2:Name", "Purfection"
+			}
 		})
 		.Build();
 
 	private IConfiguration SampleClass2Configuration_Change() => new ConfigurationBuilder()
 		.AddInMemoryCollection(new Dictionary<string, string>
 		{
-			{ "SampleClass:Timeout", "01:30:00" }, { "SampleClass:NotValid", "Something" }
+			{
+				"SampleClass:Timeout", "01:30:00"
+			},
+			{
+				"SampleClass:NotValid", "Something"
+			}
 		})
 		.Build();
 
 	private IConfiguration SampleClass2EnumerableTest() => new ConfigurationBuilder()
 		.AddInMemoryCollection(new Dictionary<string, string>
 		{
-			{ "SampleClass:EnumerableTest", "[\"10\",\"20\",\"30\"]" }
+			{
+				"SampleClass:EnumerableTest", "[\"10\",\"20\",\"30\"]"
+			}
 		})
 		.Build();
 
 	private IConfiguration SampleClass2ArrayTest() => new ConfigurationBuilder()
 		.AddInMemoryCollection(new Dictionary<string, string>
 		{
-			{ "SampleClass:ArrayTest", "[\"10\",\"20\",\"30\"]" }
+			{
+				"SampleClass:ArrayTest", "[\"10\",\"20\",\"30\"]"
+			}
 		})
 		.Build();
 
 	private IConfiguration SampleClass2ListTest() => new ConfigurationBuilder()
 		.AddInMemoryCollection(new Dictionary<string, string>
 		{
-			{ "SampleClass:ListTest", "[\"10\",\"20\",\"30\"]" }
+			{
+				"SampleClass:ListTest", "[\"10\",\"20\",\"30\"]"
+			}
 		})
 		.Build();
 #pragma warning restore CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
@@ -147,7 +183,7 @@ public void TestExtractDiscordConfig_Intents()
 		var config = source.ExtractConfig<DiscordConfiguration>("Discord");
 
 		var expected = DiscordIntents.GuildEmojisAndStickers | DiscordIntents.GuildMembers |
-					   DiscordIntents.GuildInvites | DiscordIntents.GuildMessageReactions;
+		               DiscordIntents.GuildInvites | DiscordIntents.GuildMessageReactions;
 
 		Assert.Equal(expected, config.Intents);
 	}
@@ -159,7 +195,7 @@ public void TestExtractDiscordConfig_Haphazard()
 
 		var config = source.ExtractConfig<DiscordConfiguration>("Discord");
 		var expectedIntents = DiscordIntents.GuildEmojisAndStickers | DiscordIntents.GuildMembers |
-							  DiscordIntents.Guilds;
+		                      DiscordIntents.Guilds;
 
 		Assert.Equal(expectedIntents, config.Intents);
 		Assert.True(config.MobileStatus);
@@ -206,7 +242,7 @@ public void TestSection()
 	public void TestExtractConfig_V2_Default()
 	{
 		var source = this.SampleClass2Configuration_Default();
-		var config = (SampleClass2) source.ExtractConfig("SampleClass", () => new SampleClass2("Test"), null);
+		var config = (SampleClass2)source.ExtractConfig("SampleClass", () => new SampleClass2("Test"), null);
 		Assert.Equal(TimeSpan.FromMinutes(7), config.Timeout);
 		Assert.Equal("Test", config.ConstructorValue);
 		Assert.Equal("Sample", config.Name);
@@ -216,7 +252,7 @@ public void TestExtractConfig_V2_Default()
 	public void TestExtractConfig_V2_Change()
 	{
 		var source = this.SampleClass2Configuration_Change();
-		var config = (SampleClass2) source.ExtractConfig("SampleClass", () => new SampleClass2("Test123"), null);
+		var config = (SampleClass2)source.ExtractConfig("SampleClass", () => new SampleClass2("Test123"), null);
 		var span = new TimeSpan(0, 1, 30, 0);
 		Assert.Equal(span, config.Timeout);
 		Assert.Equal("Test123", config.ConstructorValue);
@@ -314,4 +350,3 @@ public void TestHasSectionNoSuffix()
 #pragma warning restore 8625
 	}
 }
-
diff --git a/DisCatSharp.Configuration.Tests/default-discord.json b/DisCatSharp.Configuration.Tests/default-discord.json
index 127aa83e5a..22b6d82a9a 100644
--- a/DisCatSharp.Configuration.Tests/default-discord.json
+++ b/DisCatSharp.Configuration.Tests/default-discord.json
@@ -1,23 +1,23 @@
 {
-    "DisCatSharp": {
-        "Discord": {
-            "Token": "1234567890",
-            "TokenType": "Bot",
-            "MinimumLogLevel": "Information",
-            "UseRelativeRateLimit": true,
-            "LogTimestampFormat": "yyyy-MM-dd HH:mm:ss zzz",
-            "LargeThreshold": 250,
-            "AutoReconnect": true,
-            "ShardId": 123123,
-            "GatewayCompressionLevel": "Stream",
-            "MessageCacheSize": 1024,
-            "HttpTimeout": "00:00:20",
-            "ReconnectIndefinitely": false,
-            "AlwaysCacheMembers": true,
-            "MobileStatus": false,
-            "UseCanary": false,
-            "AutoRefreshChannelCache": false,
-            "Intents": "AllUnprivileged"
-        }
-    }
+	"DisCatSharp": {
+		"Discord": {
+			"Token": "1234567890",
+			"TokenType": "Bot",
+			"MinimumLogLevel": "Information",
+			"UseRelativeRateLimit": true,
+			"LogTimestampFormat": "yyyy-MM-dd HH:mm:ss zzz",
+			"LargeThreshold": 250,
+			"AutoReconnect": true,
+			"ShardId": 123123,
+			"GatewayCompressionLevel": "Stream",
+			"MessageCacheSize": 1024,
+			"HttpTimeout": "00:00:20",
+			"ReconnectIndefinitely": false,
+			"AlwaysCacheMembers": true,
+			"MobileStatus": false,
+			"UseCanary": false,
+			"AutoRefreshChannelCache": false,
+			"Intents": "AllUnprivileged"
+		}
+	}
 }
diff --git a/DisCatSharp.Configuration.Tests/enumerable-test.json b/DisCatSharp.Configuration.Tests/enumerable-test.json
index 459fc9cd56..1da8151574 100644
--- a/DisCatSharp.Configuration.Tests/enumerable-test.json
+++ b/DisCatSharp.Configuration.Tests/enumerable-test.json
@@ -1,37 +1,37 @@
 {
-    "ClassWithArray": {
-        "Values": [
-            10,11,12
-        ],
+	"ClassWithArray": {
+		"Values": [
+			10, 11, 12
+		],
 
-        "Strings": [
-            "One",
-            "Two",
-            "Three"
-        ]
-    },
+		"Strings": [
+			"One",
+			"Two",
+			"Three"
+		]
+	},
 
-    "ClassWithEnumerable": {
-        "Values": [
-            10,11,12
-        ],
+	"ClassWithEnumerable": {
+		"Values": [
+			10, 11, 12
+		],
 
-        "Strings": [
-            "One",
-            "Two",
-            "Three"
-        ]
-    },
+		"Strings": [
+			"One",
+			"Two",
+			"Three"
+		]
+	},
 
-    "ClassWithList": {
-        "Values": [
-            10,11,12
-        ],
+	"ClassWithList": {
+		"Values": [
+			10, 11, 12
+		],
 
-        "Strings": [
-            "One",
-            "Two",
-            "Three"
-        ]
-    }
+		"Strings": [
+			"One",
+			"Two",
+			"Three"
+		]
+	}
 }
diff --git a/DisCatSharp.Configuration.Tests/haphazard-discord.json b/DisCatSharp.Configuration.Tests/haphazard-discord.json
index 428af39e7f..9a7dd5e7cd 100644
--- a/DisCatSharp.Configuration.Tests/haphazard-discord.json
+++ b/DisCatSharp.Configuration.Tests/haphazard-discord.json
@@ -1,10 +1,10 @@
 {
-    "DisCatSharp": {
-        "Discord": {
-            "Intents": "GuildEmojisAndStickers,GuildMembers,Guilds",
-            "MobileStatus": true,
-            "LargeThreshold": 1000,
-            "HttpTimeout": "10:00:00"
-        }
-    }
+	"DisCatSharp": {
+		"Discord": {
+			"Intents": "GuildEmojisAndStickers,GuildMembers,Guilds",
+			"MobileStatus": true,
+			"LargeThreshold": 1000,
+			"HttpTimeout": "10:00:00"
+		}
+	}
 }
diff --git a/DisCatSharp.Configuration.Tests/intents-discord.json b/DisCatSharp.Configuration.Tests/intents-discord.json
index 520d54744c..64467ce2ec 100644
--- a/DisCatSharp.Configuration.Tests/intents-discord.json
+++ b/DisCatSharp.Configuration.Tests/intents-discord.json
@@ -1,7 +1,7 @@
 {
-    "DisCatSharp": {
-        "Discord": {
-            "Intents": "GuildEmojisAndStickers,GuildMembers,GuildInvites,GuildMessageReactions"
-        }
-    }
+	"DisCatSharp": {
+		"Discord": {
+			"Intents": "GuildEmojisAndStickers,GuildMembers,GuildInvites,GuildMessageReactions"
+		}
+	}
 }
diff --git a/DisCatSharp.Configuration.Tests/section-no-suffix.json b/DisCatSharp.Configuration.Tests/section-no-suffix.json
index 1d5ad0682d..89ad99f21f 100644
--- a/DisCatSharp.Configuration.Tests/section-no-suffix.json
+++ b/DisCatSharp.Configuration.Tests/section-no-suffix.json
@@ -1,5 +1,5 @@
 {
-    "Discord": {
-        "Values": [1,2,3,4,5]
-    }
+	"Discord": {
+		"Values": [1, 2, 3, 4, 5]
+	}
 }
diff --git a/DisCatSharp.Configuration.Tests/section-with-suffix.json b/DisCatSharp.Configuration.Tests/section-with-suffix.json
index 1489e82952..571f6a00df 100644
--- a/DisCatSharp.Configuration.Tests/section-with-suffix.json
+++ b/DisCatSharp.Configuration.Tests/section-with-suffix.json
@@ -1,5 +1,5 @@
 {
-    "DiscordConfiguration": {
-        "Values": [1,2,3,4,5]
-    }
+	"DiscordConfiguration": {
+		"Values": [1, 2, 3, 4, 5]
+	}
 }
diff --git a/DisCatSharp.Configuration/ConfigurationExtensions.cs b/DisCatSharp.Configuration/ConfigurationExtensions.cs
index 98c8424478..3d98551930 100644
--- a/DisCatSharp.Configuration/ConfigurationExtensions.cs
+++ b/DisCatSharp.Configuration/ConfigurationExtensions.cs
@@ -18,16 +18,17 @@ internal static class ConfigurationExtensions
 	/// The factory error message.
 	/// </summary>
 	private const string FACTORY_ERROR_MESSAGE = "Require a function which provides a default entity to work with";
+
 	/// <summary>
 	/// The default root lib.
 	/// </summary>
 	public const string DEFAULT_ROOT_LIB = "DisCatSharp";
+
 	/// <summary>
 	/// The config suffix.
 	/// </summary>
 	private const string CONFIG_SUFFIX = "Configuration";
 
-
 	/// <summary>
 	/// Easily piece together paths that will work within <see cref="IConfiguration"/>
 	/// </summary>
@@ -143,8 +144,12 @@ public static object ExtractConfig(this ConfigSection section, Func<object> fact
 	/// <param name="rootSectionName">(Optional) Used when section is nested within another. Default value is <see cref="DEFAULT_ROOT_LIB"/></param>
 	/// <returns>Hydrated instance of an entity which contains user-defined values (if any)</returns>
 	/// <exception cref="ArgumentNullException">When <paramref name="factory"/> is null</exception>
-	public static object ExtractConfig(this IConfiguration config, string sectionName, Func<object> factory,
-		string? rootSectionName = DEFAULT_ROOT_LIB)
+	public static object ExtractConfig(
+		this IConfiguration config,
+		string sectionName,
+		Func<object> factory,
+		string? rootSectionName = DEFAULT_ROOT_LIB
+	)
 	{
 		if (factory == null)
 			throw new ArgumentNullException(nameof(factory), FACTORY_ERROR_MESSAGE);
@@ -152,7 +157,7 @@ public static object ExtractConfig(this IConfiguration config, string sectionNam
 		// create default instance
 		var instance = factory();
 
-		HydrateInstance(ref instance, new ConfigSection(ref config, sectionName, rootSectionName));
+		HydrateInstance(ref instance, new(ref config, sectionName, rootSectionName));
 
 		return instance;
 	}
@@ -173,7 +178,7 @@ public static TConfig ExtractConfig<TConfig>(this IConfiguration config, IServic
 		// Default values should hopefully be provided from the constructor
 		var configInstance = ActivatorUtilities.CreateInstance(serviceProvider, typeof(TConfig));
 
-		HydrateInstance(ref configInstance, new ConfigSection(ref config, sectionName, rootSectionName));
+		HydrateInstance(ref configInstance, new(ref config, sectionName, rootSectionName));
 
 		return (TConfig)configInstance;
 	}
@@ -193,7 +198,7 @@ public static TConfig ExtractConfig<TConfig>(this IConfiguration config, string
 		// Default values should hopefully be provided from the constructor
 		object configInstance = new TConfig();
 
-		HydrateInstance(ref configInstance, new ConfigSection(ref config, sectionName, rootSectionName));
+		HydrateInstance(ref configInstance, new(ref config, sectionName, rootSectionName));
 
 		return (TConfig)configInstance;
 	}
@@ -274,8 +279,11 @@ public static bool HasSection(this IConfiguration config, params string[] values
 	/// <param name="serviceProvider"></param>
 	/// <param name="botSectionName"></param>
 	/// <returns>Instance of <see cref="DiscordClient"/></returns>
-	public static DiscordClient BuildClient(this IConfiguration config, IServiceProvider serviceProvider,
-		string botSectionName = DEFAULT_ROOT_LIB)
+	public static DiscordClient BuildClient(
+		this IConfiguration config,
+		IServiceProvider serviceProvider,
+		string botSectionName = DEFAULT_ROOT_LIB
+	)
 	{
 		var section = config.HasSection(botSectionName, "Discord")
 			? "Discord"
@@ -284,7 +292,7 @@ public static DiscordClient BuildClient(this IConfiguration config, IServiceProv
 				: null;
 
 		return string.IsNullOrEmpty(section)
-			? new DiscordClient(new DiscordConfiguration(serviceProvider))
+			? new(new(serviceProvider))
 			: new DiscordClient(config.ExtractConfig<DiscordConfiguration>(serviceProvider, section, botSectionName));
 	}
 }
diff --git a/DisCatSharp.Configuration/DisCatSharp.Configuration.csproj b/DisCatSharp.Configuration/DisCatSharp.Configuration.csproj
index 0b6106aafb..b0a29b1326 100644
--- a/DisCatSharp.Configuration/DisCatSharp.Configuration.csproj
+++ b/DisCatSharp.Configuration/DisCatSharp.Configuration.csproj
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <Import Project="../DisCatSharp.Targets/Version.targets" />
-    <Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
-    <Import Project="../DisCatSharp.Targets/Package.targets" />
-    <Import Project="../DisCatSharp.Targets/NuGet.targets" />
-    <Import Project="../DisCatSharp.Targets/Library.targets" />
-  <Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
+	<Import Project="../DisCatSharp.Targets/Version.targets" />
+	<Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
+	<Import Project="../DisCatSharp.Targets/Package.targets" />
+	<Import Project="../DisCatSharp.Targets/NuGet.targets" />
+	<Import Project="../DisCatSharp.Targets/Library.targets" />
+	<Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
 
-  <PropertyGroup>
-        <RootNamespace>DisCatSharp.Configuration</RootNamespace>
-        <AssemblyName>DisCatSharp.Configuration</AssemblyName>
-        <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    </PropertyGroup>
+	<PropertyGroup>
+		<RootNamespace>DisCatSharp.Configuration</RootNamespace>
+		<AssemblyName>DisCatSharp.Configuration</AssemblyName>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+	</PropertyGroup>
 
-    <PropertyGroup>
-      <PackageId>DisCatSharp.Configuration</PackageId>
-      <Description>Configuration for the DisCatSharp Hosting Extension.</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Hosting,Web,Configuration</PackageTags>
-	<Nullable>annotations</Nullable>
-    </PropertyGroup>
+	<PropertyGroup>
+		<PackageId>DisCatSharp.Configuration</PackageId>
+		<Description>Configuration for the DisCatSharp Hosting Extension.</Description>
+		<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Hosting,Web,Configuration</PackageTags>
+		<Nullable>annotations</Nullable>
+	</PropertyGroup>
 
-    <ItemGroup>
-    <PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
-      <PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
-      <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
+		<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	</ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
-    </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/DisCatSharp.EventHandlers.Tests/BasicEventHandlerTests.cs b/DisCatSharp.EventHandlers.Tests/BasicEventHandlerTests.cs
index 44097ee6c9..cae1061754 100644
--- a/DisCatSharp.EventHandlers.Tests/BasicEventHandlerTests.cs
+++ b/DisCatSharp.EventHandlers.Tests/BasicEventHandlerTests.cs
@@ -1,4 +1,3 @@
-
 #nullable enable
 using System;
 using System.Reflection;
@@ -14,7 +13,8 @@ namespace DisCatSharp.EventHandlers.Tests;
 public class BasicEventHandlerTests
 {
 	[EventHandler]
-	private class HandlerA { }
+	private class HandlerA
+	{ }
 
 	[EventHandler]
 	private class HandlerB
@@ -54,7 +54,10 @@ private abstract class BadHandlerB
 		private static Task ThisEventDoesNotExist() => Task.CompletedTask;
 	}
 
-	private readonly DiscordClient _client = new(new() { Token = "1" });
+	private readonly DiscordClient _client = new(new()
+	{
+		Token = "1"
+	});
 
 	[Fact]
 	public void TestUtility()
@@ -113,12 +116,13 @@ public void TestInvalidHandlers()
 	private bool IsEventRegistered(string name)
 	{
 		// This is super hacky, but I think it should be good enough.
-		if (name.Length == 0) { throw new ArgumentException("name mustn't be empty"); }
+		if (name.Length == 0)
+			throw new ArgumentException("name mustn't be empty");
+
 		name = "_" + char.ToLower(name[0]) + name[1..];
 		var asyncEvent = typeof(DiscordClient).GetField(name, BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(this._client);
 		dynamic handlers = asyncEvent?.GetType().GetField("_handlers", BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(asyncEvent)
-			?? throw new ArgumentException($"Unknown event \"{name}\"");
+		                   ?? throw new ArgumentException($"Unknown event \"{name}\"");
 		return handlers.Length != 0;
 	}
-
 }
diff --git a/DisCatSharp.EventHandlers.Tests/EventsEnumIntegrityTests.cs b/DisCatSharp.EventHandlers.Tests/EventsEnumIntegrityTests.cs
index 640c71db43..647b1e318b 100644
--- a/DisCatSharp.EventHandlers.Tests/EventsEnumIntegrityTests.cs
+++ b/DisCatSharp.EventHandlers.Tests/EventsEnumIntegrityTests.cs
@@ -1,4 +1,3 @@
-
 #nullable enable
 using System.Linq;
 
@@ -11,21 +10,17 @@ namespace DisCatSharp.EventHandlers.Tests;
 public class EventsEnumIntegrityTests
 {
 	[Fact]
-	void TestEnumToEvent()
+	private void TestEnumToEvent()
 	{
 		foreach (var value in typeof(DiscordEvent).GetEnumValues())
-		{
 			Assert.NotNull(typeof(DiscordClient).GetEvent(value.ToString()!));
-		}
 	}
 
 	[Fact]
-	void TestEventToEnum()
+	private void TestEventToEnum()
 	{
 		var enumNames = typeof(DiscordEvent).GetEnumNames().ToHashSet();
 		foreach (var evtn in typeof(DiscordClient).GetEvents())
-		{
 			Assert.Contains(evtn.Name, enumNames);
-		}
 	}
 }
diff --git a/DisCatSharp.EventHandlers.Tests/ServiceProviderTests.cs b/DisCatSharp.EventHandlers.Tests/ServiceProviderTests.cs
index 95b35e4b7d..e8a5d0f8fa 100644
--- a/DisCatSharp.EventHandlers.Tests/ServiceProviderTests.cs
+++ b/DisCatSharp.EventHandlers.Tests/ServiceProviderTests.cs
@@ -1,4 +1,3 @@
-
 #nullable enable
 using System;
 
@@ -10,7 +9,8 @@ namespace DisCatSharp.EventHandlers.Tests;
 
 public class ServiceProviderTests
 {
-	private class Resource { }
+	private class Resource
+	{ }
 
 	private class Handler
 	{
@@ -20,13 +20,15 @@ public Handler(Resource res) { }
 	[Fact]
 	public void Test()
 	{
-		var poorClient = new DiscordClient(new() { Token = "1" });
+		var poorClient = new DiscordClient(new()
+		{
+			Token = "1"
+		});
 		Assert.ThrowsAny<Exception>(() => poorClient.RegisterEventHandler<Handler>());
 
 		var richClient = new DiscordClient(new()
 		{
-			Token = "2",
-			ServiceProvider = new ServiceCollection().AddSingleton<Resource>().BuildServiceProvider(),
+			Token = "2", ServiceProvider = new ServiceCollection().AddSingleton<Resource>().BuildServiceProvider()
 		});
 		richClient.RegisterEventHandler<Handler>(); // May not throw.
 	}
diff --git a/DisCatSharp.Experimental/DisCatSharp.Experimental.csproj b/DisCatSharp.Experimental/DisCatSharp.Experimental.csproj
index 9d702a75e0..78e8a60759 100644
--- a/DisCatSharp.Experimental/DisCatSharp.Experimental.csproj
+++ b/DisCatSharp.Experimental/DisCatSharp.Experimental.csproj
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../DisCatSharp.Targets/Version.targets" />
-  <Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
-  <Import Project="../DisCatSharp.Targets/Package.targets" />
-  <Import Project="../DisCatSharp.Targets/NuGet.targets" />
-  <Import Project="../DisCatSharp.Targets/Library.targets" />
-  <Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
-
-  <PropertyGroup>
-	<AssemblyName>DisCatSharp.Experimental</AssemblyName>
-	<RootNamespace>DisCatSharp.Experimental</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup>
-	<PackageId>DisCatSharp.Experimental</PackageId>
-	<Description>
-	  DisCatSharp.Experimental
-
-	  Experimental changes for DisCatSharp.
-	</Description>
-	<PackageTags>DisCatSharp,Experimental,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7</PackageTags>
-	<Nullable>annotations</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
-  </ItemGroup>
+	<Import Project="../DisCatSharp.Targets/Version.targets" />
+	<Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
+	<Import Project="../DisCatSharp.Targets/Package.targets" />
+	<Import Project="../DisCatSharp.Targets/NuGet.targets" />
+	<Import Project="../DisCatSharp.Targets/Library.targets" />
+	<Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
+
+	<PropertyGroup>
+		<AssemblyName>DisCatSharp.Experimental</AssemblyName>
+		<RootNamespace>DisCatSharp.Experimental</RootNamespace>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<PackageId>DisCatSharp.Experimental</PackageId>
+		<Description>
+			DisCatSharp.Experimental
+
+			Experimental changes for DisCatSharp.
+		</Description>
+		<PackageTags>DisCatSharp,Experimental,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7</PackageTags>
+		<Nullable>annotations</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
+	</ItemGroup>
 
 	<ItemGroup>
-	<ProjectReference Include="..\DisCatSharp.Common\DisCatSharp.Common.csproj" />
-	  <ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
-  </ItemGroup>
+		<ProjectReference Include="..\DisCatSharp.Common\DisCatSharp.Common.csproj" />
+		<ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/DisCatSharp.Hosting.DependencyInjection/DisCatSharp.Hosting.DependencyInjection.csproj b/DisCatSharp.Hosting.DependencyInjection/DisCatSharp.Hosting.DependencyInjection.csproj
index 2a2ce9c1de..c5d4c9f8c0 100644
--- a/DisCatSharp.Hosting.DependencyInjection/DisCatSharp.Hosting.DependencyInjection.csproj
+++ b/DisCatSharp.Hosting.DependencyInjection/DisCatSharp.Hosting.DependencyInjection.csproj
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <Import Project="../DisCatSharp.Targets/Version.targets" />
-    <Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
-    <Import Project="../DisCatSharp.Targets/Package.targets" />
-    <Import Project="../DisCatSharp.Targets/NuGet.targets" />
-    <Import Project="../DisCatSharp.Targets/Library.targets" />
-  <Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
+	<Import Project="../DisCatSharp.Targets/Version.targets" />
+	<Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
+	<Import Project="../DisCatSharp.Targets/Package.targets" />
+	<Import Project="../DisCatSharp.Targets/NuGet.targets" />
+	<Import Project="../DisCatSharp.Targets/Library.targets" />
+	<Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
 
-    <PropertyGroup>
-      <PackageId>DisCatSharp.Hosting.DependencyInjection</PackageId>
-      <Description>Dependency Injection for the DisCatSharp Hosting Extension.</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Hosting,Web,Dependency Injection</PackageTags>
-	<Nullable>annotations</Nullable>
-    </PropertyGroup>
+	<PropertyGroup>
+		<PackageId>DisCatSharp.Hosting.DependencyInjection</PackageId>
+		<Description>Dependency Injection for the DisCatSharp Hosting Extension.</Description>
+		<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Hosting,Web,Dependency Injection</PackageTags>
+		<Nullable>annotations</Nullable>
+	</PropertyGroup>
 
-    <ItemGroup>
-    <PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
-      <PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
+		<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+	</ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\DisCatSharp.Hosting\DisCatSharp.Hosting.csproj" />
-    </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\DisCatSharp.Hosting\DisCatSharp.Hosting.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/DisCatSharp.Hosting.DependencyInjection/ServiceCollectionExtensions.cs b/DisCatSharp.Hosting.DependencyInjection/ServiceCollectionExtensions.cs
index 3e23e5aa9a..3917071213 100644
--- a/DisCatSharp.Hosting.DependencyInjection/ServiceCollectionExtensions.cs
+++ b/DisCatSharp.Hosting.DependencyInjection/ServiceCollectionExtensions.cs
@@ -76,7 +76,8 @@ public static IServiceCollection AddDiscordHostedService<TInterface, TService>(t
 	/// <typeparam name="TService">Your custom bot</typeparam>
 	/// <returns>Reference to <paramref name="services"/> for chaining purposes</returns>
 	public static IServiceCollection AddDiscordHostedShardService<TInterface, TService>(
-		this IServiceCollection services)
+		this IServiceCollection services
+	)
 		where TInterface : class, IDiscordHostedShardService
 		where TService : class, TInterface, IDiscordHostedShardService
 	{
diff --git a/DisCatSharp.Hosting.Tests/BotTwo.json b/DisCatSharp.Hosting.Tests/BotTwo.json
index 01bda1edb0..849d1b355b 100644
--- a/DisCatSharp.Hosting.Tests/BotTwo.json
+++ b/DisCatSharp.Hosting.Tests/BotTwo.json
@@ -1,8 +1,8 @@
 {
-    "BotTwo": {
-        "Discord": {
-            "Token": "1234567890",
-            "Intents": "Guilds"
-        }
-    }
+	"BotTwo": {
+		"Discord": {
+			"Token": "1234567890",
+			"Intents": "Guilds"
+		}
+	}
 }
diff --git a/DisCatSharp.Hosting.Tests/ExtensionTests.cs b/DisCatSharp.Hosting.Tests/ExtensionTests.cs
index 36458554d2..32833a04c2 100644
--- a/DisCatSharp.Hosting.Tests/ExtensionTests.cs
+++ b/DisCatSharp.Hosting.Tests/ExtensionTests.cs
@@ -13,7 +13,8 @@ namespace DisCatSharp.Hosting.Tests;
 
 public class HostExtensionTests
 {
-	#region Reference to external assemblies - required to ensure they're loaded
+#region Reference to external assemblies - required to ensure they're loaded
+
 #pragma warning disable 414
 
 	private InteractivityConfiguration? _interactivityConfig = null;
@@ -21,37 +22,76 @@ public class HostExtensionTests
 	private DiscordConfiguration? _discordConfig = null;
 
 #pragma warning restore 414
-	#endregion
+
+#endregion
 
 	private Dictionary<string, string> DefaultDiscord() =>
 		new()
 		{
-			{ "DisCatSharp:Discord:Token", "1234567890" },
-			{ "DisCatSharp:Discord:TokenType", "Bot" },
-			{ "DisCatSharp:Discord:MinimumLogLevel", "Information" },
-			{ "DisCatSharp:Discord:UseRelativeRateLimit", "true" },
-			{ "DisCatSharp:Discord:LogTimestampFormat", "yyyy-MM-dd HH:mm:ss zzz" },
-			{ "DisCatSharp:Discord:LargeThreshold", "250" },
-			{ "DisCatSharp:Discord:AutoReconnect", "true" },
-			{ "DisCatSharp:Discord:ShardId", "123123" },
-			{ "DisCatSharp:Discord:GatewayCompressionLevel", "Stream" },
-			{ "DisCatSharp:Discord:MessageCacheSize", "1024" },
-			{ "DisCatSharp:Discord:HttpTimeout", "00:00:20" },
-			{ "DisCatSharp:Discord:ReconnectIndefinitely", "false" },
-			{ "DisCatSharp:Discord:AlwaysCacheMembers", "true" },
-			{ "DisCatSharp:Discord:DiscordIntents", "AllUnprivileged" },
-			{ "DisCatSharp:Discord:MobileStatus", "false" },
-			{ "DisCatSharp:Discord:UseCanary", "false" },
-			{ "DisCatSharp:Discord:AutoRefreshChannelCache", "false" },
-			{ "DisCatSharp:Discord:Intents", "AllUnprivileged" }
+			{
+				"DisCatSharp:Discord:Token", "1234567890"
+			},
+			{
+				"DisCatSharp:Discord:TokenType", "Bot"
+			},
+			{
+				"DisCatSharp:Discord:MinimumLogLevel", "Information"
+			},
+			{
+				"DisCatSharp:Discord:UseRelativeRateLimit", "true"
+			},
+			{
+				"DisCatSharp:Discord:LogTimestampFormat", "yyyy-MM-dd HH:mm:ss zzz"
+			},
+			{
+				"DisCatSharp:Discord:LargeThreshold", "250"
+			},
+			{
+				"DisCatSharp:Discord:AutoReconnect", "true"
+			},
+			{
+				"DisCatSharp:Discord:ShardId", "123123"
+			},
+			{
+				"DisCatSharp:Discord:GatewayCompressionLevel", "Stream"
+			},
+			{
+				"DisCatSharp:Discord:MessageCacheSize", "1024"
+			},
+			{
+				"DisCatSharp:Discord:HttpTimeout", "00:00:20"
+			},
+			{
+				"DisCatSharp:Discord:ReconnectIndefinitely", "false"
+			},
+			{
+				"DisCatSharp:Discord:AlwaysCacheMembers", "true"
+			},
+			{
+				"DisCatSharp:Discord:DiscordIntents", "AllUnprivileged"
+			},
+			{
+				"DisCatSharp:Discord:MobileStatus", "false"
+			},
+			{
+				"DisCatSharp:Discord:UseCanary", "false"
+			},
+			{
+				"DisCatSharp:Discord:AutoRefreshChannelCache", "false"
+			},
+			{
+				"DisCatSharp:Discord:Intents", "AllUnprivileged"
+			}
 		};
 
 #pragma warning disable CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
 	public IConfiguration DiscordInteractivityConfiguration() => new ConfigurationBuilder()
 		.AddInMemoryCollection(new Dictionary<string, string>(this.DefaultDiscord())
 		{
-			{"DisCatSharp:Using", "[\"DisCatSharp.Interactivity\"]"} // this should be enough to automatically add the extension
-            })
+			{
+				"DisCatSharp:Using", "[\"DisCatSharp.Interactivity\"]"
+			} // this should be enough to automatically add the extension
+		})
 		.Build();
 
 	public IConfiguration DiscordOnlyConfiguration() => new ConfigurationBuilder()
@@ -90,12 +130,10 @@ public void DiscoverExtensions_InteractivityAndLavaLink()
 
 		Assert.Equal(typeof(InteractivityConfiguration), first.Value.ConfigType);
 		Assert.Equal(typeof(InteractivityExtension), first.Value.ImplementationType);
-		Assert.Equal("InteractivityExtension", first.Key, ignoreCase: true);
+		Assert.Equal("InteractivityExtension", first.Key, true);
 
 		Assert.Equal(typeof(LavalinkConfiguration), last.Value.ConfigType);
 		Assert.Equal(typeof(LavalinkExtension), last.Value.ImplementationType);
-		Assert.Equal("LavalinkExtension", last.Key, ignoreCase: true);
+		Assert.Equal("LavalinkExtension", last.Key, true);
 	}
 }
-
-
diff --git a/DisCatSharp.Hosting.Tests/GlobalSuppressions.cs b/DisCatSharp.Hosting.Tests/GlobalSuppressions.cs
index 70a147d893..400488dd62 100644
--- a/DisCatSharp.Hosting.Tests/GlobalSuppressions.cs
+++ b/DisCatSharp.Hosting.Tests/GlobalSuppressions.cs
@@ -16,8 +16,12 @@
 [assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>", Scope = "member", Target = "~M:DisCatSharp.Hosting.Tests.HostTests.Create(System.String)~Microsoft.Extensions.Hosting.IHostBuilder")]
 [assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>", Scope = "member", Target = "~M:DisCatSharp.Hosting.Tests.HostTests.Create``2(System.String)~Microsoft.Extensions.Hosting.IHostBuilder")]
 [assembly: SuppressMessage("DocumentationHeader", "ConstructorDocumentationHeader:The constructor must have a documentation header.", Justification = "<Pending>", Scope = "member", Target = "~M:DisCatSharp.Hosting.Tests.Bot.#ctor(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.ILogger{DisCatSharp.Hosting.Tests.Bot},System.IServiceProvider,Microsoft.Extensions.Hosting.IHostApplicationLifetime)")]
-[assembly: SuppressMessage("DocumentationHeader", "ConstructorDocumentationHeader:The constructor must have a documentation header.", Justification = "<Pending>", Scope = "member", Target = "~M:DisCatSharp.Hosting.Tests.BotTwoService.#ctor(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.ILogger{DisCatSharp.Hosting.Tests.BotTwoService},System.IServiceProvider,Microsoft.Extensions.Hosting.IHostApplicationLifetime)")]
-[assembly: SuppressMessage("DocumentationHeader", "ConstructorDocumentationHeader:The constructor must have a documentation header.", Justification = "<Pending>", Scope = "member", Target = "~M:DisCatSharp.Hosting.Tests.MyCustomBot.#ctor(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.ILogger{DisCatSharp.Hosting.Tests.MyCustomBot},System.IServiceProvider,Microsoft.Extensions.Hosting.IHostApplicationLifetime)")]
+[assembly:
+	SuppressMessage("DocumentationHeader", "ConstructorDocumentationHeader:The constructor must have a documentation header.", Justification = "<Pending>", Scope = "member",
+		Target = "~M:DisCatSharp.Hosting.Tests.BotTwoService.#ctor(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.ILogger{DisCatSharp.Hosting.Tests.BotTwoService},System.IServiceProvider,Microsoft.Extensions.Hosting.IHostApplicationLifetime)")]
+[assembly:
+	SuppressMessage("DocumentationHeader", "ConstructorDocumentationHeader:The constructor must have a documentation header.", Justification = "<Pending>", Scope = "member",
+		Target = "~M:DisCatSharp.Hosting.Tests.MyCustomBot.#ctor(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Logging.ILogger{DisCatSharp.Hosting.Tests.MyCustomBot},System.IServiceProvider,Microsoft.Extensions.Hosting.IHostApplicationLifetime)")]
 [assembly: SuppressMessage("Usage", "DCS0102:[Discord] Deprecated", Justification = "<Pending>")]
 [assembly: SuppressMessage("Usage", "DCS0101:[Discord] InExperiment", Justification = "<Pending>")]
 [assembly: SuppressMessage("Usage", "DCS0103:[Discord] InExperiment", Justification = "<Pending>")]
diff --git a/DisCatSharp.Hosting.Tests/HostTests.cs b/DisCatSharp.Hosting.Tests/HostTests.cs
index c9918a8234..4d8155b0f4 100644
--- a/DisCatSharp.Hosting.Tests/HostTests.cs
+++ b/DisCatSharp.Hosting.Tests/HostTests.cs
@@ -37,7 +37,6 @@ public interface IBotTwoService : IDiscordHostedService
 	string GiveMeAResponse();
 }
 
-
 public sealed class BotTwoService : DiscordHostedService, IBotTwoService
 {
 	public BotTwoService(IConfiguration config, ILogger<BotTwoService> logger, IServiceProvider provider, IHostApplicationLifetime lifetime) : base(config, logger, provider, lifetime, "BotTwo")
@@ -54,56 +53,95 @@ public class HostTests
 	private Dictionary<string, string> DefaultDiscord() =>
 		new()
 		{
-			{ "DisCatSharp:Discord:Token", "1234567890" },
-			{ "DisCatSharp:Discord:TokenType", "Bot" },
-			{ "DisCatSharp:Discord:MinimumLogLevel", "Information" },
-			{ "DisCatSharp:Discord:UseRelativeRateLimit", "true" },
-			{ "DisCatSharp:Discord:LogTimestampFormat", "yyyy-MM-dd HH:mm:ss zzz" },
-			{ "DisCatSharp:Discord:LargeThreshold", "250" },
-			{ "DisCatSharp:Discord:AutoReconnect", "true" },
-			{ "DisCatSharp:Discord:ShardId", "123123" },
-			{ "DisCatSharp:Discord:GatewayCompressionLevel", "Stream" },
-			{ "DisCatSharp:Discord:MessageCacheSize", "1024" },
-			{ "DisCatSharp:Discord:HttpTimeout", "00:00:20" },
-			{ "DisCatSharp:Discord:ReconnectIndefinitely", "false" },
-			{ "DisCatSharp:Discord:AlwaysCacheMembers", "true" },
-			{ "DisCatSharp:Discord:DiscordIntents", "AllUnprivileged" },
-			{ "DisCatSharp:Discord:MobileStatus", "false" },
-			{ "DisCatSharp:Discord:UseCanary", "false" },
-			{ "DisCatSharp:Discord:AutoRefreshChannelCache", "false" },
-			{ "DisCatSharp:Discord:Intents", "AllUnprivileged" }
+			{
+				"DisCatSharp:Discord:Token", "1234567890"
+			},
+			{
+				"DisCatSharp:Discord:TokenType", "Bot"
+			},
+			{
+				"DisCatSharp:Discord:MinimumLogLevel", "Information"
+			},
+			{
+				"DisCatSharp:Discord:UseRelativeRateLimit", "true"
+			},
+			{
+				"DisCatSharp:Discord:LogTimestampFormat", "yyyy-MM-dd HH:mm:ss zzz"
+			},
+			{
+				"DisCatSharp:Discord:LargeThreshold", "250"
+			},
+			{
+				"DisCatSharp:Discord:AutoReconnect", "true"
+			},
+			{
+				"DisCatSharp:Discord:ShardId", "123123"
+			},
+			{
+				"DisCatSharp:Discord:GatewayCompressionLevel", "Stream"
+			},
+			{
+				"DisCatSharp:Discord:MessageCacheSize", "1024"
+			},
+			{
+				"DisCatSharp:Discord:HttpTimeout", "00:00:20"
+			},
+			{
+				"DisCatSharp:Discord:ReconnectIndefinitely", "false"
+			},
+			{
+				"DisCatSharp:Discord:AlwaysCacheMembers", "true"
+			},
+			{
+				"DisCatSharp:Discord:DiscordIntents", "AllUnprivileged"
+			},
+			{
+				"DisCatSharp:Discord:MobileStatus", "false"
+			},
+			{
+				"DisCatSharp:Discord:UseCanary", "false"
+			},
+			{
+				"DisCatSharp:Discord:AutoRefreshChannelCache", "false"
+			},
+			{
+				"DisCatSharp:Discord:Intents", "AllUnprivileged"
+			}
 		};
 
 	public Dictionary<string, string> DiscordInteractivity() => new(this.DefaultDiscord())
 	{
-		{ "DisCatSharp:Using", "[\"DisCatSharp.Interactivity\"]" },
+		{
+			"DisCatSharp:Using", "[\"DisCatSharp.Interactivity\"]"
+		}
 	};
 
 	public Dictionary<string, string> DiscordInteractivityAndLavalink() => new(this.DefaultDiscord())
 	{
-		{ "DisCatSharp:Using", "[\"DisCatSharp.Interactivity\", \"DisCatSharp.Lavalink\"]" },
+		{
+			"DisCatSharp:Using", "[\"DisCatSharp.Interactivity\", \"DisCatSharp.Lavalink\"]"
+		}
 	};
 
 #pragma warning disable CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
-	IHostBuilder Create(Dictionary<string, string> configValues) =>
+	private IHostBuilder Create(Dictionary<string, string> configValues) =>
 		Host.CreateDefaultBuilder()
 			.ConfigureServices(services => services.AddSingleton<IDiscordHostedService, Bot>())
 			.ConfigureHostConfiguration(builder => builder.AddInMemoryCollection(configValues));
 #pragma warning restore CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
 
-	IHostBuilder Create(string filename) =>
+	private IHostBuilder Create(string filename) =>
 		Host.CreateDefaultBuilder()
 			.ConfigureServices(services => services.AddSingleton<IDiscordHostedService, MyCustomBot>())
 			.ConfigureHostConfiguration(builder => builder.AddJsonFile(filename));
 
-	IHostBuilder Create<TInterface, TBot>(string filename)
+	private IHostBuilder Create<TInterface, TBot>(string filename)
 		where TInterface : class, IDiscordHostedService
 		where TBot : class, TInterface, IDiscordHostedService =>
 		Host.CreateDefaultBuilder()
 			.ConfigureServices(services => services.AddSingleton<TInterface, TBot>())
 			.ConfigureHostConfiguration(builder => builder.AddJsonFile(filename));
 
-
 	[Fact]
 	public void TestBotCustomInterface()
 	{
@@ -140,10 +178,9 @@ public void TestDifferentSection_InteractivityOnly()
 			Assert.Null(service.Client.GetExtension<LavalinkExtension>());
 
 			var intents = DiscordIntents.GuildEmojisAndStickers | DiscordIntents.GuildMembers |
-						  DiscordIntents.Guilds;
+			              DiscordIntents.Guilds;
 			Assert.Equal(intents, service.Client.Intents);
 
-
 			var interactivity = service.Client.GetExtension<InteractivityExtension>();
 			Assert.NotNull(interactivity);
 
diff --git a/DisCatSharp.Hosting.Tests/interactivity-different-section.json b/DisCatSharp.Hosting.Tests/interactivity-different-section.json
index 1fdcef8fe7..0d8081691d 100644
--- a/DisCatSharp.Hosting.Tests/interactivity-different-section.json
+++ b/DisCatSharp.Hosting.Tests/interactivity-different-section.json
@@ -1,12 +1,12 @@
 {
-    "MyCustomBot": {
-        "Using": [
-            "Interactivity"
-        ],
+	"MyCustomBot": {
+		"Using": [
+			"Interactivity"
+		],
 
-        "Discord": {
-            "Token": "1234567890",
-            "Intents": "GuildEmojisAndStickers,GuildMembers,Guilds"
-        }
-    }
+		"Discord": {
+			"Token": "1234567890",
+			"Intents": "GuildEmojisAndStickers,GuildMembers,Guilds"
+		}
+	}
 }
diff --git a/DisCatSharp.Hosting.Tests/interactivity-lavalink.json b/DisCatSharp.Hosting.Tests/interactivity-lavalink.json
index 1121fb5294..9486a9ecf9 100644
--- a/DisCatSharp.Hosting.Tests/interactivity-lavalink.json
+++ b/DisCatSharp.Hosting.Tests/interactivity-lavalink.json
@@ -1,8 +1,8 @@
 {
-    "DisCatSharp": {
-        "Using": [
-            "Interactivity",
-            "Lavalink"
-        ]
-    }
+	"DisCatSharp": {
+		"Using": [
+			"Interactivity",
+			"Lavalink"
+		]
+	}
 }
diff --git a/DisCatSharp.Hosting.Tests/lavalink-different-section.json b/DisCatSharp.Hosting.Tests/lavalink-different-section.json
index 91d48b92fb..65a75f94c1 100644
--- a/DisCatSharp.Hosting.Tests/lavalink-different-section.json
+++ b/DisCatSharp.Hosting.Tests/lavalink-different-section.json
@@ -1,12 +1,12 @@
 {
-    "MyCustomBot": {
-        "Using": [
-            "Lavalink"
-        ],
+	"MyCustomBot": {
+		"Using": [
+			"Lavalink"
+		],
 
-        "Discord": {
-            "Token": "1234567890",
-            "Intents": "Guilds"
-        }
-    }
+		"Discord": {
+			"Token": "1234567890",
+			"Intents": "Guilds"
+		}
+	}
 }
diff --git a/DisCatSharp.Hosting/BaseHostedService.cs b/DisCatSharp.Hosting/BaseHostedService.cs
index e21641dc12..8c1a2af5ba 100644
--- a/DisCatSharp.Hosting/BaseHostedService.cs
+++ b/DisCatSharp.Hosting/BaseHostedService.cs
@@ -33,11 +33,13 @@ public abstract class BaseHostedService : BackgroundService
 	/// <param name="serviceProvider">The service provider.</param>
 	/// <param name="applicationLifetime">The application lifetime.</param>
 	/// <param name="configBotSection">The config bot section.</param>
-	internal BaseHostedService(IConfiguration config,
+	internal BaseHostedService(
+		IConfiguration config,
 		ILogger<BaseHostedService> logger,
 		IServiceProvider serviceProvider,
 		IHostApplicationLifetime applicationLifetime,
-		string configBotSection = DisCatSharp.Configuration.ConfigurationExtensions.DEFAULT_ROOT_LIB)
+		string configBotSection = DisCatSharp.Configuration.ConfigurationExtensions.DEFAULT_ROOT_LIB
+	)
 	{
 		this.Configuration = config;
 		this.Logger = logger;
@@ -97,7 +99,10 @@ Public Constructors --> Public
 
 				var instance = ctors.Any(x => x.GetParameters().Length == 1 && x.GetParameters().First().ParameterType == typePair.Value.ConfigType)
 					? Activator.CreateInstance(typePair.Value.ImplementationType, flags, null,
-												new[] { configInstance }, null)
+						new[]
+						{
+							configInstance
+						}, null)
 					: Activator.CreateInstance(typePair.Value.ImplementationType, true);
 
 				/*
@@ -108,7 +113,6 @@ Those who don't -- simply instantiate
                        ActivatorUtilities requires a public constructor, anything with internal breaks
                      */
 
-
 				if (instance == null)
 				{
 					this.Logger.LogError($"Unable to instantiate '{typePair.Value.ImplementationType.Name}'");
@@ -166,11 +170,11 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 		catch (Exception ex)
 		{
 			/*
-                 * Anything before DOTNET 6 will
-                 * fail silently despite throwing an exception in this method
-                 * So to overcome this obstacle we need to log what happens and
-                 * manually exit
-                 */
+			 * Anything before DOTNET 6 will
+			 * fail silently despite throwing an exception in this method
+			 * So to overcome this obstacle we need to log what happens and
+			 * manually exit
+			 */
 			this.Logger.LogError($"Was unable to start {this.GetType().Name} Bot as a Hosted Service");
 
 			// Power given to developer for handling exception
diff --git a/DisCatSharp.Hosting/ConfigurationExtensions.cs b/DisCatSharp.Hosting/ConfigurationExtensions.cs
index 53d251198f..9f91d0abda 100644
--- a/DisCatSharp.Hosting/ConfigurationExtensions.cs
+++ b/DisCatSharp.Hosting/ConfigurationExtensions.cs
@@ -16,10 +16,12 @@ internal struct ExtensionConfigResult
 	/// Gets or sets the section.
 	/// </summary>
 	public ConfigSection? Section { get; set; }
+
 	/// <summary>
 	/// Gets or sets the config type.
 	/// </summary>
 	public Type ConfigType { get; set; }
+
 	/// <summary>
 	/// Gets or sets the implementation type.
 	/// </summary>
@@ -44,7 +46,6 @@ internal static class ConfigurationExtensions
 	/// <returns>Assemblies which meet the given names. No duplicates</returns>
 	public static List<Assembly> FindAssemblies(IEnumerable<string>? names)
 	{
-
 		/*
               There is a possibility that an assembly can be referenced in multiple assemblies.
               To alleviate duplicates we need to shrink our queue as we find things
@@ -68,13 +69,11 @@ To alleviate duplicates we need to shrink our queue as we find things
 
 			// Is this something we're looking for?
 			if (queue.Remove(loadedAssemblyName))
-			{
 				results.Add(assembly);
-			}
 
 			// Time to check if one of the referenced assemblies is something we're looking for
 			foreach (var referencedAssembly in assembly.GetReferencedAssemblies()
-													  .Where(x => x.Name != null && queue.Contains(x.Name)))
+				.Where(x => x.Name != null && queue.Contains(x.Name)))
 				try
 				{
 					// Must load the assembly into our workspace so we can do stuff with it later
@@ -97,8 +96,10 @@ To alleviate duplicates we need to shrink our queue as we find things
 	/// <param name="configuration"></param>
 	/// <param name="rootName"></param>
 	/// <returns>Dictionary where Key -> Name of implemented type<br/>Value -> <see cref="ExtensionConfigResult"/></returns>
-	public static Dictionary<string, ExtensionConfigResult> FindImplementedExtensions(this IConfiguration configuration,
-		string rootName = Configuration.ConfigurationExtensions.DEFAULT_ROOT_LIB)
+	public static Dictionary<string, ExtensionConfigResult> FindImplementedExtensions(
+		this IConfiguration configuration,
+		string rootName = Configuration.ConfigurationExtensions.DEFAULT_ROOT_LIB
+	)
 	{
 		if (string.IsNullOrEmpty(rootName))
 			throw new ArgumentNullException(nameof(rootName), "Root name must be provided");
@@ -120,7 +121,7 @@ JSON or as Text.
 		assemblyNames = string.IsNullOrEmpty(configuration[configuration.ConfigPath(rootName, "Using")])
 			? configuration.GetSection(configuration.ConfigPath(rootName, "Using")).Get<string[]>()
 			: Newtonsoft.Json.JsonConvert.DeserializeObject<string[]>(
-					configuration[configuration.ConfigPath(rootName, "Using")]);
+				configuration[configuration.ConfigPath(rootName, "Using")]);
 		foreach (var assembly in FindAssemblies(assemblyNames.Select(x => x.StartsWith(Constants.LibName) ? x : $"{Constants.LibName}.{x}")))
 		{
 			ExtensionConfigResult result = new();
@@ -167,5 +168,4 @@ In the event a user has some "fluff" between prefix and suffix we'll
 
 		return results;
 	}
-
 }
diff --git a/DisCatSharp.Hosting/Constants.cs b/DisCatSharp.Hosting/Constants.cs
index a79effa0f9..80648e4fd2 100644
--- a/DisCatSharp.Hosting/Constants.cs
+++ b/DisCatSharp.Hosting/Constants.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Hosting;
 
 /// <summary>
@@ -10,10 +9,12 @@ internal static class Constants
 	/// Gets the lib name.
 	/// </summary>
 	public static string LibName => Configuration.ConfigurationExtensions.DEFAULT_ROOT_LIB;
+
 	/// <summary>
 	/// Gets the config suffix.
 	/// </summary>
 	public static string ConfigSuffix => "Configuration";
+
 	/// <summary>
 	/// Gets the extension suffix.
 	/// </summary>
diff --git a/DisCatSharp.Hosting/DiscordHostedService.cs b/DisCatSharp.Hosting/DiscordHostedService.cs
index f7c8700944..d158bfbbb5 100644
--- a/DisCatSharp.Hosting/DiscordHostedService.cs
+++ b/DisCatSharp.Hosting/DiscordHostedService.cs
@@ -25,15 +25,15 @@ public abstract class DiscordHostedService : BaseHostedService, IDiscordHostedSe
 	/// <param name="serviceProvider">ServiceProvider reference which contains all items currently registered for Dependency Injection</param>
 	/// <param name="applicationLifetime">Contains the appropriate methods for disposing / stopping BackgroundServices during runtime</param>
 	/// <param name="configBotSection">The name of the JSON/Config Key which contains the configuration for this Discord Service</param>
-	protected DiscordHostedService(IConfiguration config,
+	protected DiscordHostedService(
+		IConfiguration config,
 		ILogger<DiscordHostedService> logger,
 		IServiceProvider serviceProvider,
 		IHostApplicationLifetime applicationLifetime,
-		string configBotSection = DisCatSharp.Configuration.ConfigurationExtensions.DEFAULT_ROOT_LIB)
+		string configBotSection = DisCatSharp.Configuration.ConfigurationExtensions.DEFAULT_ROOT_LIB
+	)
 		: base(config, logger, serviceProvider, applicationLifetime, configBotSection)
-	{
-
-	}
+	{ }
 
 	protected override Task ConfigureAsync()
 	{
@@ -49,6 +49,7 @@ protected override Task ConfigureAsync()
 
 		return Task.CompletedTask;
 	}
+
 	protected sealed override async Task ConnectAsync() => await this.Client.ConnectAsync();
 
 	protected override Task ConfigureExtensionsAsync()
diff --git a/DisCatSharp.Hosting/DiscordSharedHostedService.cs b/DisCatSharp.Hosting/DiscordSharedHostedService.cs
index 151c594110..cce174473e 100644
--- a/DisCatSharp.Hosting/DiscordSharedHostedService.cs
+++ b/DisCatSharp.Hosting/DiscordSharedHostedService.cs
@@ -24,22 +24,22 @@ public abstract class DiscordShardedHostedService : BaseHostedService, IDiscordH
 	/// <param name="serviceProvider">The service provider.</param>
 	/// <param name="applicationLifetime">The application lifetime.</param>
 	/// <param name="configBotSection">The config bot section.</param>
-	protected DiscordShardedHostedService(IConfiguration config,
+	protected DiscordShardedHostedService(
+		IConfiguration config,
 		ILogger<DiscordShardedHostedService> logger,
 		IServiceProvider serviceProvider,
 		IHostApplicationLifetime applicationLifetime,
-		string configBotSection = DisCatSharp.Configuration.ConfigurationExtensions.DEFAULT_ROOT_LIB)
+		string configBotSection = DisCatSharp.Configuration.ConfigurationExtensions.DEFAULT_ROOT_LIB
+	)
 		: base(config, logger, serviceProvider, applicationLifetime, configBotSection)
-	{
-
-	}
+	{ }
 
 	protected override Task ConfigureAsync()
 	{
 		try
 		{
 			var config = this.Configuration.ExtractConfig<DiscordConfiguration>(this.ServiceProvider, "Discord", this.BotSection);
-			this.ShardedClient = new DiscordShardedClient(config);
+			this.ShardedClient = new(config);
 		}
 		catch (Exception ex)
 		{
@@ -55,9 +55,7 @@ protected override Task ConfigureAsync()
 	protected override Task ConfigureExtensionsAsync()
 	{
 		foreach (var client in this.ShardedClient.ShardClients.Values)
-		{
 			this.InitializeExtensions(client);
-		}
 
 		return Task.CompletedTask;
 	}
diff --git a/DisCatSharp.Hosting/IDiscordHostedService.cs b/DisCatSharp.Hosting/IDiscordHostedService.cs
index c9c4d06c5d..cf8539beb7 100644
--- a/DisCatSharp.Hosting/IDiscordHostedService.cs
+++ b/DisCatSharp.Hosting/IDiscordHostedService.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Hosting;
 
 /// <summary>
diff --git a/DisCatSharp.Interactivity/DisCatSharp.Interactivity.csproj b/DisCatSharp.Interactivity/DisCatSharp.Interactivity.csproj
index 554b34102f..d290157415 100644
--- a/DisCatSharp.Interactivity/DisCatSharp.Interactivity.csproj
+++ b/DisCatSharp.Interactivity/DisCatSharp.Interactivity.csproj
@@ -1,44 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../DisCatSharp.Targets/Version.targets" />
-  <Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
-  <Import Project="../DisCatSharp.Targets/Package.targets" />
-  <Import Project="../DisCatSharp.Targets/NuGet.targets" />
-  <Import Project="../DisCatSharp.Targets/Library.targets" />
-  <Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
-
-  <PropertyGroup>
-    <AssemblyName>DisCatSharp.Interactivity</AssemblyName>
-    <RootNamespace>DisCatSharp.Interactivity</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <PackageId>DisCatSharp.Interactivity</PackageId>
-	<Description>
-DisCatSharp Interactivity Extension
-
-Unleash the full power of discord commands.
-
-Documentation: https://docs.dcs.aitsys.dev/articles/modules/interactivity.html
-	</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Pagination,Reactions,Buttons,Interactive Commands,Interactivity,Message Components</PackageTags>
-	<Nullable>annotations</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="ConcurrentHashSet" Version="1.3.0" />
-    <PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
-    <PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
-  </ItemGroup>
+	<Import Project="../DisCatSharp.Targets/Version.targets" />
+	<Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
+	<Import Project="../DisCatSharp.Targets/Package.targets" />
+	<Import Project="../DisCatSharp.Targets/NuGet.targets" />
+	<Import Project="../DisCatSharp.Targets/Library.targets" />
+	<Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
+
+	<PropertyGroup>
+		<AssemblyName>DisCatSharp.Interactivity</AssemblyName>
+		<RootNamespace>DisCatSharp.Interactivity</RootNamespace>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<PackageId>DisCatSharp.Interactivity</PackageId>
+		<Description>
+			DisCatSharp Interactivity Extension
+
+			Unleash the full power of discord commands.
+
+			Documentation: https://docs.dcs.aitsys.dev/articles/modules/interactivity.html
+		</Description>
+		<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Pagination,Reactions,Buttons,Interactive Commands,Interactivity,Message Components</PackageTags>
+		<Nullable>annotations</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="ConcurrentHashSet" Version="1.3.0" />
+		<PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
+		<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/DisCatSharp.Interactivity/Enums/ButtonPaginationBehavior.cs b/DisCatSharp.Interactivity/Enums/ButtonPaginationBehavior.cs
index 98a459fa52..69e3c723b9 100644
--- a/DisCatSharp.Interactivity/Enums/ButtonPaginationBehavior.cs
+++ b/DisCatSharp.Interactivity/Enums/ButtonPaginationBehavior.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Interactivity.Enums;
 
 /// <summary>
@@ -10,14 +9,17 @@ public enum ButtonPaginationBehavior
 	/// The buttons should be disabled when pagination times out.
 	/// </summary>
 	Disable,
+
 	/// <summary>
 	/// The buttons should be left as is when pagination times out.
 	/// </summary>
 	Ignore,
+
 	/// <summary>
 	/// The entire message should be deleted when pagination times out.
 	/// </summary>
 	DeleteMessage,
+
 	/// <summary>
 	/// The buttons should be removed entirely when pagination times out.
 	/// </summary>
diff --git a/DisCatSharp.Interactivity/Enums/InteractionResponseBehavior.cs b/DisCatSharp.Interactivity/Enums/InteractionResponseBehavior.cs
index f881ff164c..10cb73e32b 100644
--- a/DisCatSharp.Interactivity/Enums/InteractionResponseBehavior.cs
+++ b/DisCatSharp.Interactivity/Enums/InteractionResponseBehavior.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Interactivity.Enums;
 
 /// <summary>
@@ -10,10 +9,12 @@ public enum InteractionResponseBehavior
 	/// Indicates that invalid input should be ignored when waiting for interactions. This will cause the interaction to fail.
 	/// </summary>
 	Ignore,
+
 	/// <summary>
 	/// Indicates that invalid input should be ACK'd. The interaction will succeed, but nothing will happen.
 	/// </summary>
 	Ack,
+
 	/// <summary>
 	/// Indicates that invalid input should warrant an ephemeral error message.
 	/// </summary>
diff --git a/DisCatSharp.Interactivity/Enums/Modal/ModalPage.cs b/DisCatSharp.Interactivity/Enums/Modal/ModalPage.cs
index 02bb2c9ed6..b74401baae 100644
--- a/DisCatSharp.Interactivity/Enums/Modal/ModalPage.cs
+++ b/DisCatSharp.Interactivity/Enums/Modal/ModalPage.cs
@@ -17,7 +17,7 @@ public class ModalPage
 	public ModalPage(DiscordInteractionModalBuilder modal, DiscordButtonComponent openButton = null, string openText = null)
 	{
 		this.Modal = modal;
-		this.OpenButton = openButton ?? new DiscordButtonComponent(ButtonStyle.Primary, null, "Open next page", false, new DiscordComponentEmoji(DiscordEmoji.FromUnicode("📄")));
+		this.OpenButton = openButton ?? new DiscordButtonComponent(ButtonStyle.Primary, null, "Open next page", false, new(DiscordEmoji.FromUnicode("📄")));
 		this.OpenMessage = new DiscordInteractionResponseBuilder().WithContent(openText ?? "`Click the button below to continue to the next page.`").AsEphemeral();
 	}
 
diff --git a/DisCatSharp.Interactivity/Enums/PaginationBehaviour.cs b/DisCatSharp.Interactivity/Enums/PaginationBehaviour.cs
index 32c64ba576..8a8476ab21 100644
--- a/DisCatSharp.Interactivity/Enums/PaginationBehaviour.cs
+++ b/DisCatSharp.Interactivity/Enums/PaginationBehaviour.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Interactivity.Enums;
 
 /// <summary>
diff --git a/DisCatSharp.Interactivity/Enums/PaginationDeletion.cs b/DisCatSharp.Interactivity/Enums/PaginationDeletion.cs
index dd9d8cf4e7..bb3dc35bb8 100644
--- a/DisCatSharp.Interactivity/Enums/PaginationDeletion.cs
+++ b/DisCatSharp.Interactivity/Enums/PaginationDeletion.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Interactivity.Enums;
 
 /// <summary>
diff --git a/DisCatSharp.Interactivity/Enums/PollBehaviour.cs b/DisCatSharp.Interactivity/Enums/PollBehaviour.cs
index 4fdc320b5a..1acb3306a8 100644
--- a/DisCatSharp.Interactivity/Enums/PollBehaviour.cs
+++ b/DisCatSharp.Interactivity/Enums/PollBehaviour.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Interactivity.Enums;
 
 /// <summary>
diff --git a/DisCatSharp.Interactivity/Enums/SplitType.cs b/DisCatSharp.Interactivity/Enums/SplitType.cs
index fb5549d196..630a8cb94e 100644
--- a/DisCatSharp.Interactivity/Enums/SplitType.cs
+++ b/DisCatSharp.Interactivity/Enums/SplitType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Interactivity.Enums;
 
 /// <summary>
diff --git a/DisCatSharp.Interactivity/EventHandling/Components/ComponentEventWaiter.cs b/DisCatSharp.Interactivity/EventHandling/Components/ComponentEventWaiter.cs
index b63ccc6bae..f5d249721d 100644
--- a/DisCatSharp.Interactivity/EventHandling/Components/ComponentEventWaiter.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Components/ComponentEventWaiter.cs
@@ -36,7 +36,10 @@ public ComponentEventWaiter(DiscordClient client, InteractivityConfiguration con
 		this._client.ComponentInteractionCreated += this.Handle;
 		this._config = config;
 
-		this._message = new DiscordFollowupMessageBuilder { Content = config.ResponseMessage ?? "This message was not meant for you.", IsEphemeral = true };
+		this._message = new()
+		{
+			Content = config.ResponseMessage ?? "This message was not meant for you.", IsEphemeral = true
+		};
 	}
 
 	/// <summary>
@@ -95,17 +98,13 @@ public async Task<IReadOnlyList<ComponentInteractionCreateEventArgs>> CollectMat
 	private async Task Handle(DiscordClient _, ComponentInteractionCreateEventArgs args)
 	{
 		foreach (var mreq in this._matchRequests)
-		{
 			if (mreq.Message == args.Message && mreq.IsMatch(args))
 				mreq.Tcs.TrySetResult(args);
 
 			else if (this._config.ResponseBehavior is InteractionResponseBehavior.Respond)
 				await args.Interaction.CreateFollowupMessageAsync(this._message).ConfigureAwait(false);
-		}
-
 
 		foreach (var creq in this._collectRequests)
-		{
 			if (creq.Message == args.Message && creq.IsMatch(args))
 			{
 				await args.Interaction.CreateResponseAsync(InteractionResponseType.DeferredMessageUpdate).ConfigureAwait(false);
@@ -116,8 +115,8 @@ private async Task Handle(DiscordClient _, ComponentInteractionCreateEventArgs a
 				else if (this._config.ResponseBehavior is InteractionResponseBehavior.Respond)
 					await args.Interaction.CreateFollowupMessageAsync(this._message).ConfigureAwait(false);
 			}
-		}
 	}
+
 	/// <summary>
 	/// Disposes the waiter.
 	/// </summary>
diff --git a/DisCatSharp.Interactivity/EventHandling/Components/ComponentPaginator.cs b/DisCatSharp.Interactivity/EventHandling/Components/ComponentPaginator.cs
index 0df7a0866c..c2485b8913 100644
--- a/DisCatSharp.Interactivity/EventHandling/Components/ComponentPaginator.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Components/ComponentPaginator.cs
@@ -70,7 +70,6 @@ public async Task DoPaginationAsync(IPaginationRequest request)
 	/// </summary>
 	public void Dispose() => this._client.ComponentInteractionCreated -= this.Handle;
 
-
 	/// <summary>
 	/// Handles the pagination event.
 	/// </summary>
@@ -93,7 +92,10 @@ private async Task Handle(DiscordClient _, ComponentInteractionCreateEventArgs e
 		if (await req.GetUserAsync().ConfigureAwait(false) != e.User)
 		{
 			if (this._config.ResponseBehavior is InteractionResponseBehavior.Respond)
-				await e.Interaction.CreateFollowupMessageAsync(new DiscordFollowupMessageBuilder { Content = this._config.ResponseMessage, IsEphemeral = true }).ConfigureAwait(false);
+				await e.Interaction.CreateFollowupMessageAsync(new()
+				{
+					Content = this._config.ResponseMessage, IsEphemeral = true
+				}).ConfigureAwait(false);
 
 			return;
 		}
@@ -124,7 +126,7 @@ private async Task HandlePaginationAsync(IPaginationRequest request, ComponentIn
 			_ when id == buttons.SkipRight.CustomId => request.SkipRightAsync(),
 			_ when id == buttons.Stop.CustomId => Task.FromResult(tcs.TrySetResult(true)),
 			_ when id == buttons.Left.CustomId => request.PreviousPageAsync(),
-			_ when id == buttons.Right.CustomId => request.NextPageAsync(),
+			_ when id == buttons.Right.CustomId => request.NextPageAsync()
 		};
 
 		await paginationTask.ConfigureAwait(false);
@@ -134,7 +136,6 @@ private async Task HandlePaginationAsync(IPaginationRequest request, ComponentIn
 
 		var page = await request.GetPageAsync().ConfigureAwait(false);
 
-
 		var bts = await request.GetButtonsAsync().ConfigureAwait(false);
 
 		if (request is InteractionPaginationRequest ipr)
@@ -156,6 +157,5 @@ private async Task HandlePaginationAsync(IPaginationRequest request, ComponentIn
 			.AddComponents(bts);
 
 		await this._builder.ModifyAsync(msg).ConfigureAwait(false);
-
 	}
 }
diff --git a/DisCatSharp.Interactivity/EventHandling/Components/ModalEventWaiter.cs b/DisCatSharp.Interactivity/EventHandling/Components/ModalEventWaiter.cs
index 0e5c2c7535..af5ffba4bd 100644
--- a/DisCatSharp.Interactivity/EventHandling/Components/ModalEventWaiter.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Components/ModalEventWaiter.cs
@@ -33,7 +33,10 @@ public ModalEventWaiter(DiscordClient client, InteractivityConfiguration config)
 		this._client.ComponentInteractionCreated += this.Handle;
 		this._config = config;
 
-		this._message = new DiscordFollowupMessageBuilder { Content = config.ResponseMessage ?? "This modal was not meant for you.", IsEphemeral = true };
+		this._message = new()
+		{
+			Content = config.ResponseMessage ?? "This modal was not meant for you.", IsEphemeral = true
+		};
 	}
 
 	/// <summary>
@@ -68,13 +71,11 @@ public async Task<ComponentInteractionCreateEventArgs> WaitForModalMatchAsync(Mo
 	private async Task Handle(DiscordClient _, ComponentInteractionCreateEventArgs args)
 	{
 		foreach (var mreq in this._modalMatchRequests)
-		{
 			if (mreq.CustomId == args.Interaction.Data.CustomId && mreq.IsMatch(args))
 				mreq.Tcs.TrySetResult(args);
 
 			else if (this._config.ResponseBehavior is InteractionResponseBehavior.Respond)
 				await args.Interaction.CreateFollowupMessageAsync(this._message).ConfigureAwait(false);
-		}
 	}
 
 	/// <summary>
diff --git a/DisCatSharp.Interactivity/EventHandling/Components/PaginationButtons.cs b/DisCatSharp.Interactivity/EventHandling/Components/PaginationButtons.cs
index 49e6a0dd94..b5374021ca 100644
--- a/DisCatSharp.Interactivity/EventHandling/Components/PaginationButtons.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Components/PaginationButtons.cs
@@ -38,11 +38,7 @@ public class PaginationButtons
 	/// </summary>
 	internal DiscordButtonComponent[] ButtonArray => new[]
 	{
-		this.SkipLeft,
-		this.Left,
-		this.Stop,
-		this.Right,
-		this.SkipRight
+		this.SkipLeft, this.Left, this.Stop, this.Right, this.SkipRight
 	};
 
 	public const string SKIP_LEFT_CUSTOM_ID = "pgb-skip-left";
@@ -56,11 +52,11 @@ public class PaginationButtons
 	/// </summary>
 	public PaginationButtons()
 	{
-		this.SkipLeft = new DiscordButtonComponent(ButtonStyle.Secondary, "leftskip", null, false, new DiscordComponentEmoji(DiscordEmoji.FromUnicode("⏮")));
-		this.Left = new DiscordButtonComponent(ButtonStyle.Secondary, "left", null, false, new DiscordComponentEmoji(DiscordEmoji.FromUnicode("◀")));
-		this.Stop = new DiscordButtonComponent(ButtonStyle.Secondary, "stop", null, false, new DiscordComponentEmoji(DiscordEmoji.FromUnicode("⏹")));
-		this.Right = new DiscordButtonComponent(ButtonStyle.Secondary, "right", null, false, new DiscordComponentEmoji(DiscordEmoji.FromUnicode("▶")));
-		this.SkipRight = new DiscordButtonComponent(ButtonStyle.Secondary, "rightskip", null, false, new DiscordComponentEmoji(DiscordEmoji.FromUnicode("⏭")));
+		this.SkipLeft = new(ButtonStyle.Secondary, "leftskip", null, false, new(DiscordEmoji.FromUnicode("⏮")));
+		this.Left = new(ButtonStyle.Secondary, "left", null, false, new(DiscordEmoji.FromUnicode("◀")));
+		this.Stop = new(ButtonStyle.Secondary, "stop", null, false, new(DiscordEmoji.FromUnicode("⏹")));
+		this.Right = new(ButtonStyle.Secondary, "right", null, false, new(DiscordEmoji.FromUnicode("▶")));
+		this.SkipRight = new(ButtonStyle.Secondary, "rightskip", null, false, new(DiscordEmoji.FromUnicode("⏭")));
 	}
 
 	/// <summary>
@@ -69,10 +65,10 @@ public PaginationButtons()
 	/// <param name="other">The other <see cref="PaginationButtons"/>.</param>
 	public PaginationButtons(PaginationButtons other)
 	{
-		this.Stop = new DiscordButtonComponent(other.Stop);
-		this.Left = new DiscordButtonComponent(other.Left);
-		this.Right = new DiscordButtonComponent(other.Right);
-		this.SkipLeft = new DiscordButtonComponent(other.SkipLeft);
-		this.SkipRight = new DiscordButtonComponent(other.SkipRight);
+		this.Stop = new(other.Stop);
+		this.Left = new(other.Left);
+		this.Right = new(other.Right);
+		this.SkipLeft = new(other.SkipLeft);
+		this.SkipRight = new(other.SkipRight);
 	}
 }
diff --git a/DisCatSharp.Interactivity/EventHandling/Components/Requests/ButtonPaginationRequest.cs b/DisCatSharp.Interactivity/EventHandling/Components/Requests/ButtonPaginationRequest.cs
index 9f5119ba8b..811b25ce65 100644
--- a/DisCatSharp.Interactivity/EventHandling/Components/Requests/ButtonPaginationRequest.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Components/Requests/ButtonPaginationRequest.cs
@@ -36,13 +36,19 @@ internal class ButtonPaginationRequest : IPaginationRequest
 	/// <param name="buttons">The buttons.</param>
 	/// <param name="pages">The pages.</param>
 	/// <param name="token">The token.</param>
-	public ButtonPaginationRequest(DiscordMessage message, DiscordUser user,
-		PaginationBehaviour behavior, ButtonPaginationBehavior buttonBehavior,
-		PaginationButtons buttons, IEnumerable<Page> pages, CancellationToken token)
+	public ButtonPaginationRequest(
+		DiscordMessage message,
+		DiscordUser user,
+		PaginationBehaviour behavior,
+		ButtonPaginationBehavior buttonBehavior,
+		PaginationButtons buttons,
+		IEnumerable<Page> pages,
+		CancellationToken token
+	)
 	{
 		this._user = user;
 		this._token = token;
-		this._buttons = new PaginationButtons(buttons);
+		this._buttons = new(buttons);
 		this._message = message;
 		this._wrapBehavior = behavior;
 		this._behaviorBehavior = buttonBehavior;
diff --git a/DisCatSharp.Interactivity/EventHandling/Components/Requests/InteractionPaginationRequest.cs b/DisCatSharp.Interactivity/EventHandling/Components/Requests/InteractionPaginationRequest.cs
index f93019186c..800f93d7d8 100644
--- a/DisCatSharp.Interactivity/EventHandling/Components/Requests/InteractionPaginationRequest.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Components/Requests/InteractionPaginationRequest.cs
@@ -19,7 +19,6 @@ internal class InteractionPaginationRequest : IPaginationRequest
 
 	private readonly TaskCompletionSource<bool> _tcs = new();
 
-
 	private DiscordInteraction _lastInteraction;
 	private CancellationTokenSource _interactionCts;
 
@@ -30,7 +29,6 @@ internal class InteractionPaginationRequest : IPaginationRequest
 	private readonly PaginationBehaviour _wrapBehavior;
 	private readonly ButtonPaginationBehavior _behaviorBehavior;
 
-
 	/// <summary>
 	/// Initializes a new instance of the <see cref="InteractionPaginationRequest"/> class.
 	/// </summary>
@@ -42,13 +40,20 @@ internal class InteractionPaginationRequest : IPaginationRequest
 	/// <param name="buttons">The buttons.</param>
 	/// <param name="pages">The pages.</param>
 	/// <param name="token">The token.</param>
-	public InteractionPaginationRequest(DiscordInteraction interaction, DiscordMessage message, DiscordUser user,
-		PaginationBehaviour behavior, ButtonPaginationBehavior behaviorBehavior,
-		PaginationButtons buttons, IEnumerable<Page> pages, CancellationToken token)
+	public InteractionPaginationRequest(
+		DiscordInteraction interaction,
+		DiscordMessage message,
+		DiscordUser user,
+		PaginationBehaviour behavior,
+		ButtonPaginationBehavior behaviorBehavior,
+		PaginationButtons buttons,
+		IEnumerable<Page> pages,
+		CancellationToken token
+	)
 	{
 		this._user = user;
 		this._token = token;
-		this._buttons = new PaginationButtons(buttons);
+		this._buttons = new(buttons);
 		this._message = message;
 		this._wrapBehavior = behavior;
 		this._behaviorBehavior = behaviorBehavior;
@@ -71,7 +76,7 @@ internal void RegenerateCts(DiscordInteraction interaction)
 	{
 		this._interactionCts?.Dispose();
 		this._lastInteraction = interaction;
-		this._interactionCts = new CancellationTokenSource(TimeSpan.FromSeconds((60 * 15) - 5));
+		this._interactionCts = new(TimeSpan.FromSeconds(60 * 15 - 5));
 		this._interactionCts.Token.Register(() => this._tcs.TrySetResult(false));
 	}
 
diff --git a/DisCatSharp.Interactivity/EventHandling/EventWaiter.cs b/DisCatSharp.Interactivity/EventHandling/EventWaiter.cs
index f0acc41f69..739cc18714 100644
--- a/DisCatSharp.Interactivity/EventHandling/EventWaiter.cs
+++ b/DisCatSharp.Interactivity/EventHandling/EventWaiter.cs
@@ -20,12 +20,12 @@ namespace DisCatSharp.Interactivity.EventHandling;
 /// <typeparam name="T"></typeparam>
 internal class EventWaiter<T> : IDisposable where T : AsyncEventArgs
 {
-	DiscordClient _client;
-	AsyncEvent<DiscordClient, T> _event;
-	AsyncEventHandler<DiscordClient, T> _handler;
-	ConcurrentHashSet<MatchRequest<T>> _matchRequests;
-	ConcurrentHashSet<CollectRequest<T>> _collectRequests;
-	bool _disposed;
+	private DiscordClient _client;
+	private AsyncEvent<DiscordClient, T> _event;
+	private AsyncEventHandler<DiscordClient, T> _handler;
+	private ConcurrentHashSet<MatchRequest<T>> _matchRequests;
+	private ConcurrentHashSet<CollectRequest<T>> _collectRequests;
+	private bool _disposed;
 
 	/// <summary>
 	/// Creates a new EventWaiter object.
@@ -36,10 +36,10 @@ public EventWaiter(DiscordClient client)
 		this._client = client;
 		var tinfo = this._client.GetType().GetTypeInfo();
 		var handler = tinfo.DeclaredFields.First(x => x.FieldType == typeof(AsyncEvent<DiscordClient, T>));
-		this._matchRequests = new ConcurrentHashSet<MatchRequest<T>>();
-		this._collectRequests = new ConcurrentHashSet<CollectRequest<T>>();
+		this._matchRequests = new();
+		this._collectRequests = new();
 		this._event = (AsyncEvent<DiscordClient, T>)handler.GetValue(this._client);
-		this._handler = new AsyncEventHandler<DiscordClient, T>(this.HandleEvent);
+		this._handler = new(this.HandleEvent);
 		this._event.Register(this._handler);
 	}
 
@@ -65,6 +65,7 @@ public async Task<T> WaitForMatchAsync(MatchRequest<T> request)
 			request.Dispose();
 			this._matchRequests.TryRemove(request);
 		}
+
 		return result;
 	}
 
@@ -86,10 +87,11 @@ public async Task<ReadOnlyCollection<T>> CollectMatchesAsync(CollectRequest<T> r
 		}
 		finally
 		{
-			result = new ReadOnlyCollection<T>(new HashSet<T>(request.Collected).ToList());
+			result = new(new HashSet<T>(request.Collected).ToList());
 			request.Dispose();
 			this._collectRequests.TryRemove(request);
 		}
+
 		return result;
 	}
 
@@ -103,20 +105,12 @@ private Task HandleEvent(DiscordClient client, T eventArgs)
 		if (!this._disposed)
 		{
 			foreach (var req in this._matchRequests)
-			{
 				if (req.Predicate(eventArgs))
-				{
 					req.Tcs.TrySetResult(eventArgs);
-				}
-			}
 
 			foreach (var req in this._collectRequests)
-			{
 				if (req.Predicate(eventArgs))
-				{
 					req.Collected.Add(eventArgs);
-				}
-			}
 		}
 
 		return Task.CompletedTask;
diff --git a/DisCatSharp.Interactivity/EventHandling/Paginator.cs b/DisCatSharp.Interactivity/EventHandling/Paginator.cs
index 6ab00da4ce..9e1bcd93d8 100644
--- a/DisCatSharp.Interactivity/EventHandling/Paginator.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Paginator.cs
@@ -17,8 +17,8 @@ namespace DisCatSharp.Interactivity.EventHandling;
 /// </summary>
 internal class Paginator : IPaginator
 {
-	DiscordClient _client;
-	ConcurrentHashSet<IPaginationRequest> _requests;
+	private DiscordClient _client;
+	private ConcurrentHashSet<IPaginationRequest> _requests;
 
 	/// <summary>
 	/// Creates a new EventWaiter object.
@@ -27,7 +27,7 @@ internal class Paginator : IPaginator
 	public Paginator(DiscordClient client)
 	{
 		this._client = client;
-		this._requests = new ConcurrentHashSet<IPaginationRequest>();
+		this._requests = new();
 
 		this._client.MessageReactionAdded += this.HandleReactionAdd;
 		this._client.MessageReactionRemoved += this.HandleReactionRemove;
@@ -88,36 +88,26 @@ private Task HandleReactionAdd(DiscordClient client, MessageReactionAddEventArgs
 					if (eventArgs.User.Id == usr.Id)
 					{
 						if (req.PageCount > 1 &&
-							(eventArgs.Emoji == emojis.Left ||
-							 eventArgs.Emoji == emojis.SkipLeft ||
-							 eventArgs.Emoji == emojis.Right ||
-							 eventArgs.Emoji == emojis.SkipRight ||
-							 eventArgs.Emoji == emojis.Stop))
-						{
+						    (eventArgs.Emoji == emojis.Left ||
+						     eventArgs.Emoji == emojis.SkipLeft ||
+						     eventArgs.Emoji == emojis.Right ||
+						     eventArgs.Emoji == emojis.SkipRight ||
+						     eventArgs.Emoji == emojis.Stop))
 							await this.PaginateAsync(req, eventArgs.Emoji).ConfigureAwait(false);
-						}
 						else if (eventArgs.Emoji == emojis.Stop &&
-								 req is PaginationRequest paginationRequest &&
-								 paginationRequest.PaginationDeletion == PaginationDeletion.DeleteMessage)
-						{
+						         req is PaginationRequest paginationRequest &&
+						         paginationRequest.PaginationDeletion == PaginationDeletion.DeleteMessage)
 							await this.PaginateAsync(req, eventArgs.Emoji).ConfigureAwait(false);
-						}
 						else
-						{
 							await msg.DeleteReactionAsync(eventArgs.Emoji, eventArgs.User).ConfigureAwait(false);
-						}
 					}
 					else if (eventArgs.User.Id != this._client.CurrentUser.Id)
-					{
 						if (eventArgs.Emoji != emojis.Left &&
-						   eventArgs.Emoji != emojis.SkipLeft &&
-						   eventArgs.Emoji != emojis.Right &&
-						   eventArgs.Emoji != emojis.SkipRight &&
-						   eventArgs.Emoji != emojis.Stop)
-						{
+						    eventArgs.Emoji != emojis.SkipLeft &&
+						    eventArgs.Emoji != emojis.Right &&
+						    eventArgs.Emoji != emojis.SkipRight &&
+						    eventArgs.Emoji != emojis.Stop)
 							await msg.DeleteReactionAsync(eventArgs.Emoji, eventArgs.User).ConfigureAwait(false);
-						}
-					}
 				}
 			}
 		});
@@ -143,26 +133,20 @@ private Task HandleReactionRemove(DiscordClient client, MessageReactionRemoveEve
 				var usr = await req.GetUserAsync().ConfigureAwait(false);
 
 				if (msg.Id == eventArgs.Message.Id)
-				{
 					if (eventArgs.User.Id == usr.Id)
 					{
 						if (req.PageCount > 1 &&
-							(eventArgs.Emoji == emojis.Left ||
-							 eventArgs.Emoji == emojis.SkipLeft ||
-							 eventArgs.Emoji == emojis.Right ||
-							 eventArgs.Emoji == emojis.SkipRight ||
-							 eventArgs.Emoji == emojis.Stop))
-						{
+						    (eventArgs.Emoji == emojis.Left ||
+						     eventArgs.Emoji == emojis.SkipLeft ||
+						     eventArgs.Emoji == emojis.Right ||
+						     eventArgs.Emoji == emojis.SkipRight ||
+						     eventArgs.Emoji == emojis.Stop))
 							await this.PaginateAsync(req, eventArgs.Emoji).ConfigureAwait(false);
-						}
 						else if (eventArgs.Emoji == emojis.Stop &&
-								 req is PaginationRequest paginationRequest &&
-								 paginationRequest.PaginationDeletion == PaginationDeletion.DeleteMessage)
-						{
+						         req is PaginationRequest paginationRequest &&
+						         paginationRequest.PaginationDeletion == PaginationDeletion.DeleteMessage)
 							await this.PaginateAsync(req, eventArgs.Emoji).ConfigureAwait(false);
-						}
 					}
-				}
 			}
 		});
 
@@ -186,9 +170,7 @@ private Task HandleReactionClear(DiscordClient client, MessageReactionsClearEven
 				var msg = await req.GetMessageAsync().ConfigureAwait(false);
 
 				if (msg.Id == eventArgs.Message.Id)
-				{
 					await this.ResetReactionsAsync(req).ConfigureAwait(false);
-				}
 			}
 		});
 
@@ -225,9 +207,7 @@ private async Task ResetReactionsAsync(IPaginationRequest p)
 				await msg.CreateReactionAsync(emojis.Stop).ConfigureAwait(false);
 		}
 		else if (emojis.Stop != null && p is PaginationRequest paginationRequest && paginationRequest.PaginationDeletion == PaginationDeletion.DeleteMessage)
-		{
 			await msg.CreateReactionAsync(emojis.Stop).ConfigureAwait(false);
-		}
 	}
 
 	/// <summary>
diff --git a/DisCatSharp.Interactivity/EventHandling/Poller.cs b/DisCatSharp.Interactivity/EventHandling/Poller.cs
index 0ff6933c53..72712d98a0 100644
--- a/DisCatSharp.Interactivity/EventHandling/Poller.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Poller.cs
@@ -18,8 +18,8 @@ namespace DisCatSharp.Interactivity.EventHandling;
 /// </summary>
 internal class Poller
 {
-	DiscordClient _client;
-	ConcurrentHashSet<PollRequest> _requests;
+	private DiscordClient _client;
+	private ConcurrentHashSet<PollRequest> _requests;
 
 	/// <summary>
 	/// Creates a new EventWaiter object.
@@ -28,7 +28,7 @@ internal class Poller
 	public Poller(DiscordClient client)
 	{
 		this._client = client;
-		this._requests = new ConcurrentHashSet<PollRequest>();
+		this._requests = new();
 
 		this._client.MessageReactionAdded += this.HandleReactionAdd;
 		this._client.MessageReactionRemoved += this.HandleReactionRemove;
@@ -54,10 +54,11 @@ public async Task<ReadOnlyCollection<PollEmoji>> DoPollAsync(PollRequest request
 		}
 		finally
 		{
-			result = new ReadOnlyCollection<PollEmoji>(new HashSet<PollEmoji>(request.Collected).ToList());
+			result = new(new HashSet<PollEmoji>(request.Collected).ToList());
 			request.Dispose();
 			this._requests.TryRemove(request);
 		}
+
 		return result;
 	}
 
@@ -75,7 +76,6 @@ private Task HandleReactionAdd(DiscordClient client, MessageReactionAddEventArgs
 		_ = Task.Run(async () =>
 		{
 			foreach (var req in this._requests)
-			{
 				// match message
 				if (req.Message.Id == eventArgs.Message.Id && req.Message.ChannelId == eventArgs.Channel.Id)
 				{
@@ -91,7 +91,6 @@ private Task HandleReactionAdd(DiscordClient client, MessageReactionAddEventArgs
 							await eventArgs.Message.DeleteReactionAsync(eventArgs.Emoji, eventArgs.User).ConfigureAwait(false);
 					}
 				}
-			}
 		});
 		return Task.CompletedTask;
 	}
@@ -105,14 +104,10 @@ private Task HandleReactionAdd(DiscordClient client, MessageReactionAddEventArgs
 	private Task HandleReactionRemove(DiscordClient client, MessageReactionRemoveEventArgs eventArgs)
 	{
 		foreach (var req in this._requests)
-		{
 			// match message
 			if (req.Message.Id == eventArgs.Message.Id && req.Message.ChannelId == eventArgs.Channel.Id)
-			{
 				if (eventArgs.User.Id != this._client.CurrentUser.Id)
 					req.RemoveReaction(eventArgs.Emoji, eventArgs.User);
-			}
-		}
 		return Task.CompletedTask;
 	}
 
@@ -125,13 +120,9 @@ private Task HandleReactionRemove(DiscordClient client, MessageReactionRemoveEve
 	private Task HandleReactionClear(DiscordClient client, MessageReactionsClearEventArgs eventArgs)
 	{
 		foreach (var req in this._requests)
-		{
 			// match message
 			if (req.Message.Id == eventArgs.Message.Id && req.Message.ChannelId == eventArgs.Channel.Id)
-			{
 				req.ClearCollected();
-			}
-		}
 		return Task.CompletedTask;
 	}
 
diff --git a/DisCatSharp.Interactivity/EventHandling/ReactionCollector.cs b/DisCatSharp.Interactivity/EventHandling/ReactionCollector.cs
index ebc1505e3a..52c8cb5c6e 100644
--- a/DisCatSharp.Interactivity/EventHandling/ReactionCollector.cs
+++ b/DisCatSharp.Interactivity/EventHandling/ReactionCollector.cs
@@ -22,18 +22,18 @@ namespace DisCatSharp.Interactivity.EventHandling;
 /// </summary>
 internal class ReactionCollector : IDisposable
 {
-	DiscordClient _client;
+	private DiscordClient _client;
 
-	AsyncEvent<DiscordClient, MessageReactionAddEventArgs> _reactionAddEvent;
-	AsyncEventHandler<DiscordClient, MessageReactionAddEventArgs> _reactionAddHandler;
+	private AsyncEvent<DiscordClient, MessageReactionAddEventArgs> _reactionAddEvent;
+	private AsyncEventHandler<DiscordClient, MessageReactionAddEventArgs> _reactionAddHandler;
 
-	AsyncEvent<DiscordClient, MessageReactionRemoveEventArgs> _reactionRemoveEvent;
-	AsyncEventHandler<DiscordClient, MessageReactionRemoveEventArgs> _reactionRemoveHandler;
+	private AsyncEvent<DiscordClient, MessageReactionRemoveEventArgs> _reactionRemoveEvent;
+	private AsyncEventHandler<DiscordClient, MessageReactionRemoveEventArgs> _reactionRemoveHandler;
 
-	AsyncEvent<DiscordClient, MessageReactionsClearEventArgs> _reactionClearEvent;
-	AsyncEventHandler<DiscordClient, MessageReactionsClearEventArgs> _reactionClearHandler;
+	private AsyncEvent<DiscordClient, MessageReactionsClearEventArgs> _reactionClearEvent;
+	private AsyncEventHandler<DiscordClient, MessageReactionsClearEventArgs> _reactionClearHandler;
 
-	ConcurrentHashSet<ReactionCollectRequest> _requests;
+	private ConcurrentHashSet<ReactionCollectRequest> _requests;
 
 	/// <summary>
 	/// Creates a new EventWaiter object.
@@ -44,25 +44,25 @@ public ReactionCollector(DiscordClient client)
 		this._client = client;
 		var tinfo = this._client.GetType().GetTypeInfo();
 
-		this._requests = new ConcurrentHashSet<ReactionCollectRequest>();
+		this._requests = new();
 
 		// Grabbing all three events from client
 		var handler = tinfo.DeclaredFields.First(x => x.FieldType == typeof(AsyncEvent<DiscordClient, MessageReactionAddEventArgs>));
 
 		this._reactionAddEvent = (AsyncEvent<DiscordClient, MessageReactionAddEventArgs>)handler.GetValue(this._client);
-		this._reactionAddHandler = new AsyncEventHandler<DiscordClient, MessageReactionAddEventArgs>(this.HandleReactionAdd);
+		this._reactionAddHandler = new(this.HandleReactionAdd);
 		this._reactionAddEvent.Register(this._reactionAddHandler);
 
 		handler = tinfo.DeclaredFields.First(x => x.FieldType == typeof(AsyncEvent<DiscordClient, MessageReactionRemoveEventArgs>));
 
 		this._reactionRemoveEvent = (AsyncEvent<DiscordClient, MessageReactionRemoveEventArgs>)handler.GetValue(this._client);
-		this._reactionRemoveHandler = new AsyncEventHandler<DiscordClient, MessageReactionRemoveEventArgs>(this.HandleReactionRemove);
+		this._reactionRemoveHandler = new(this.HandleReactionRemove);
 		this._reactionRemoveEvent.Register(this._reactionRemoveHandler);
 
 		handler = tinfo.DeclaredFields.First(x => x.FieldType == typeof(AsyncEvent<DiscordClient, MessageReactionsClearEventArgs>));
 
 		this._reactionClearEvent = (AsyncEvent<DiscordClient, MessageReactionsClearEventArgs>)handler.GetValue(this._client);
-		this._reactionClearHandler = new AsyncEventHandler<DiscordClient, MessageReactionsClearEventArgs>(this.HandleReactionClear);
+		this._reactionClearHandler = new(this.HandleReactionClear);
 		this._reactionClearEvent.Register(this._reactionClearHandler);
 	}
 
@@ -86,10 +86,11 @@ public async Task<ReadOnlyCollection<Reaction>> CollectAsync(ReactionCollectRequ
 		}
 		finally
 		{
-			result = new ReadOnlyCollection<Reaction>(new HashSet<Reaction>(request.Collected).ToList());
+			result = new(new HashSet<Reaction>(request.Collected).ToList());
 			request.Dispose();
 			this._requests.TryRemove(request);
 		}
+
 		return result;
 	}
 
@@ -103,7 +104,6 @@ private Task HandleReactionAdd(DiscordClient client, MessageReactionAddEventArgs
 	{
 		// foreach request add
 		foreach (var req in this._requests)
-		{
 			if (req.Message.Id == eventArgs.Message.Id)
 			{
 				if (req.Collected.Any(x => x.Emoji == eventArgs.Emoji && x.Users.Any(y => y.Id == eventArgs.User.Id)))
@@ -114,15 +114,16 @@ private Task HandleReactionAdd(DiscordClient client, MessageReactionAddEventArgs
 					req.Collected.Add(reaction);
 				}
 				else
-				{
-					req.Collected.Add(new Reaction()
+					req.Collected.Add(new()
 					{
 						Emoji = eventArgs.Emoji,
-						Users = new ConcurrentHashSet<DiscordUser>() { eventArgs.User }
+						Users = new()
+						{
+							eventArgs.User
+						}
 					});
-				}
 			}
-		}
+
 		return Task.CompletedTask;
 	}
 
@@ -136,9 +137,7 @@ private Task HandleReactionRemove(DiscordClient client, MessageReactionRemoveEve
 	{
 		// foreach request remove
 		foreach (var req in this._requests)
-		{
 			if (req.Message.Id == eventArgs.Message.Id)
-			{
 				if (req.Collected.Any(x => x.Emoji == eventArgs.Emoji && x.Users.Any(y => y.Id == eventArgs.User.Id)))
 				{
 					var reaction = req.Collected.First(x => x.Emoji == eventArgs.Emoji && x.Users.Any(y => y.Id == eventArgs.User.Id));
@@ -147,8 +146,7 @@ private Task HandleReactionRemove(DiscordClient client, MessageReactionRemoveEve
 					if (reaction.Users.Count > 0)
 						req.Collected.Add(reaction);
 				}
-			}
-		}
+
 		return Task.CompletedTask;
 	}
 
@@ -162,12 +160,8 @@ private Task HandleReactionClear(DiscordClient client, MessageReactionsClearEven
 	{
 		// foreach request add
 		foreach (var req in this._requests)
-		{
 			if (req.Message.Id == eventArgs.Message.Id)
-			{
 				req.Collected.Clear();
-			}
-		}
 		return Task.CompletedTask;
 	}
 
@@ -219,10 +213,10 @@ public class ReactionCollectRequest : IDisposable
 	public ReactionCollectRequest(DiscordMessage msg, TimeSpan timeout)
 	{
 		this.Message = msg;
-		this.Collected = new ConcurrentHashSet<Reaction>();
+		this.Collected = new();
 		this.Timeout = timeout;
-		this.Tcs = new TaskCompletionSource<Reaction>();
-		this.Ct = new CancellationTokenSource(this.Timeout);
+		this.Tcs = new();
+		this.Ct = new(this.Timeout);
 		this.Ct.Token.Register(() => this.Tcs.TrySetResult(null));
 	}
 
@@ -254,10 +248,12 @@ public class Reaction
 	/// Gets the emoji.
 	/// </summary>
 	public DiscordEmoji Emoji { get; internal set; }
+
 	/// <summary>
 	/// Gets the users.
 	/// </summary>
 	public ConcurrentHashSet<DiscordUser> Users { get; internal set; }
+
 	/// <summary>
 	/// Gets the total.
 	/// </summary>
diff --git a/DisCatSharp.Interactivity/EventHandling/Requests/CollectRequest.cs b/DisCatSharp.Interactivity/EventHandling/Requests/CollectRequest.cs
index 2633f2b878..65dacaa69a 100644
--- a/DisCatSharp.Interactivity/EventHandling/Requests/CollectRequest.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Requests/CollectRequest.cs
@@ -28,12 +28,12 @@ internal class CollectRequest<T> : IDisposable where T : AsyncEventArgs
 	/// <param name="timeout">Timeout time</param>
 	public CollectRequest(Func<T, bool> predicate, TimeSpan timeout)
 	{
-		this.Tcs = new TaskCompletionSource<bool>();
-		this.Ct = new CancellationTokenSource(timeout);
+		this.Tcs = new();
+		this.Ct = new(timeout);
 		this.Predicate = predicate;
 		this.Ct.Token.Register(() => this.Tcs.TrySetResult(true));
 		this.Timeout = timeout;
-		this.Collected = new ConcurrentHashSet<T>();
+		this.Collected = new();
 	}
 
 	~CollectRequest()
@@ -55,11 +55,11 @@ public void Dispose()
 			this.Collected.Clear();
 			this.Collected = null;
 		}
+
 		GC.SuppressFinalize(this);
 	}
 }
 
-
 /*
               ^  ^
 ( Quack! )> (ﾐචᆽචﾐ)
diff --git a/DisCatSharp.Interactivity/EventHandling/Requests/MatchRequest.cs b/DisCatSharp.Interactivity/EventHandling/Requests/MatchRequest.cs
index 13a64cb49d..7d4c6dde76 100644
--- a/DisCatSharp.Interactivity/EventHandling/Requests/MatchRequest.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Requests/MatchRequest.cs
@@ -25,8 +25,8 @@ internal class MatchRequest<T> : IDisposable where T : AsyncEventArgs
 	/// <param name="timeout">Timeout time</param>
 	public MatchRequest(Func<T, bool> predicate, TimeSpan timeout)
 	{
-		this.Tcs = new TaskCompletionSource<T>();
-		this.Ct = new CancellationTokenSource(timeout);
+		this.Tcs = new();
+		this.Ct = new(timeout);
 		this.Predicate = predicate;
 		this.Ct.Token.Register(() => this.Tcs.TrySetResult(null));
 		this.Timeout = timeout;
diff --git a/DisCatSharp.Interactivity/EventHandling/Requests/PaginationRequest.cs b/DisCatSharp.Interactivity/EventHandling/Requests/PaginationRequest.cs
index e619468e83..0739dc118c 100644
--- a/DisCatSharp.Interactivity/EventHandling/Requests/PaginationRequest.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Requests/PaginationRequest.cs
@@ -33,11 +33,18 @@ internal class PaginationRequest : IPaginationRequest
 		/// <param name="emojis">Emojis for this pagination object</param>
 		/// <param name="timeout">Timeout time</param>
 		/// <param name="pages">Pagination pages</param>
-		internal PaginationRequest(DiscordMessage message, DiscordUser user, PaginationBehaviour behaviour, PaginationDeletion deletion,
-			PaginationEmojis emojis, TimeSpan timeout, IEnumerable<Page> pages)
+		internal PaginationRequest(
+			DiscordMessage message,
+			DiscordUser user,
+			PaginationBehaviour behaviour,
+			PaginationDeletion deletion,
+			PaginationEmojis emojis,
+			TimeSpan timeout,
+			IEnumerable<Page> pages
+		)
 		{
-			this._tcs = new TaskCompletionSource<bool>();
-			this._ct = new CancellationTokenSource(timeout);
+			this._tcs = new();
+			this._ct = new(timeout);
 			this._ct.Token.Register(() => this._tcs.TrySetResult(true));
 			this._timeout = timeout;
 
@@ -48,11 +55,9 @@ internal PaginationRequest(DiscordMessage message, DiscordUser user, PaginationB
 			this._behaviour = behaviour;
 			this._emojis = emojis;
 
-			this._pages = new List<Page>();
+			this._pages = new();
 			foreach (var p in pages)
-			{
 				this._pages.Add(p);
-			}
 		}
 
 		/// <summary>
@@ -277,6 +282,7 @@ public class Page
 		/// Gets or sets the content.
 		/// </summary>
 		public string Content { get; set; }
+
 		/// <summary>
 		/// Gets or sets the embed.
 		/// </summary>
diff --git a/DisCatSharp.Interactivity/EventHandling/Requests/PollRequest.cs b/DisCatSharp.Interactivity/EventHandling/Requests/PollRequest.cs
index 4f0fcdf188..a504fc37f1 100644
--- a/DisCatSharp.Interactivity/EventHandling/Requests/PollRequest.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Requests/PollRequest.cs
@@ -30,18 +30,16 @@ public class PollRequest
 	/// <param name="emojis"></param>
 	public PollRequest(DiscordMessage message, TimeSpan timeout, IEnumerable<DiscordEmoji> emojis)
 	{
-		this.Tcs = new TaskCompletionSource<bool>();
-		this.Ct = new CancellationTokenSource(timeout);
+		this.Tcs = new();
+		this.Ct = new(timeout);
 		this.Ct.Token.Register(() => this.Tcs.TrySetResult(true));
 		this.Timeout = timeout;
 		this.Emojis = emojis.ToList();
-		this.Collected = new ConcurrentHashSet<PollEmoji>();
+		this.Collected = new();
 		this.Message = message;
 
 		foreach (var e in emojis)
-		{
-			this.Collected.Add(new PollEmoji(e));
-		}
+			this.Collected.Add(new(e));
 	}
 
 	/// <summary>
@@ -51,9 +49,7 @@ internal void ClearCollected()
 	{
 		this.Collected.Clear();
 		foreach (var e in this.Emojis)
-		{
-			this.Collected.Add(new PollEmoji(e));
-		}
+			this.Collected.Add(new(e));
 	}
 
 	/// <summary>
@@ -64,7 +60,6 @@ internal void ClearCollected()
 	internal void RemoveReaction(DiscordEmoji emoji, DiscordUser member)
 	{
 		if (this.Collected.Any(x => x.Emoji == emoji))
-		{
 			if (this.Collected.Any(x => x.Voted.Contains(member)))
 			{
 				var e = this.Collected.First(x => x.Emoji == emoji);
@@ -72,7 +67,6 @@ internal void RemoveReaction(DiscordEmoji emoji, DiscordUser member)
 				e.Voted.TryRemove(member);
 				this.Collected.Add(e);
 			}
-		}
 	}
 
 	/// <summary>
@@ -83,7 +77,6 @@ internal void RemoveReaction(DiscordEmoji emoji, DiscordUser member)
 	internal void AddReaction(DiscordEmoji emoji, DiscordUser member)
 	{
 		if (this.Collected.Any(x => x.Emoji == emoji))
-		{
 			if (!this.Collected.Any(x => x.Voted.Contains(member)))
 			{
 				var e = this.Collected.First(x => x.Emoji == emoji);
@@ -91,7 +84,6 @@ internal void AddReaction(DiscordEmoji emoji, DiscordUser member)
 				e.Voted.Add(member);
 				this.Collected.Add(e);
 			}
-		}
 	}
 
 	~PollRequest()
@@ -121,11 +113,12 @@ public class PollEmoji
 	internal PollEmoji(DiscordEmoji emoji)
 	{
 		this.Emoji = emoji;
-		this.Voted = new ConcurrentHashSet<DiscordUser>();
+		this.Voted = new();
 	}
 
 	public DiscordEmoji Emoji;
 	public ConcurrentHashSet<DiscordUser> Voted;
+
 	/// <summary>
 	/// Gets the total.
 	/// </summary>
diff --git a/DisCatSharp.Interactivity/Extensions/ChannelExtensions.cs b/DisCatSharp.Interactivity/Extensions/ChannelExtensions.cs
index 214231aa73..6d7e7e76fc 100644
--- a/DisCatSharp.Interactivity/Extensions/ChannelExtensions.cs
+++ b/DisCatSharp.Interactivity/Extensions/ChannelExtensions.cs
@@ -54,7 +54,6 @@ public static Task<InteractivityResult<DiscordMessage>> GetNextMessageAsync(this
 	public static Task<InteractivityResult<TypingStartEventArgs>> WaitForUserTypingAsync(this DiscordChannel channel, DiscordUser user, TimeSpan? timeoutOverride = null)
 		=> GetInteractivity(channel).WaitForUserTypingAsync(user, channel, timeoutOverride);
 
-
 	/// <summary>
 	/// Sends a new paginated message.
 	/// </summary>
@@ -101,7 +100,6 @@ public static Task SendPaginatedMessageAsync(this DiscordChannel channel, Discor
 	public static Task SendPaginatedMessageAsync(this DiscordChannel channel, DiscordUser user, IEnumerable<Page> pages, PaginationButtons buttons, TimeSpan? timeoutOverride, PaginationBehaviour? behaviour = default, ButtonPaginationBehavior? deletion = default)
 		=> GetInteractivity(channel).SendPaginatedMessageAsync(channel, user, pages, buttons, timeoutOverride, behaviour, deletion);
 
-
 	/// <summary>
 	/// Sends the paginated message async.
 	/// </summary>
diff --git a/DisCatSharp.Interactivity/Extensions/ClientExtensions.cs b/DisCatSharp.Interactivity/Extensions/ClientExtensions.cs
index 55c84efe28..b24ddff755 100644
--- a/DisCatSharp.Interactivity/Extensions/ClientExtensions.cs
+++ b/DisCatSharp.Interactivity/Extensions/ClientExtensions.cs
@@ -22,7 +22,7 @@ public static InteractivityExtension UseInteractivity(this DiscordClient client,
 	{
 		if (client.GetExtension<InteractivityExtension>() != null) throw new InvalidOperationException($"Interactivity is already enabled for this {(client.IsShard ? "shard" : "client")}.");
 
-		configuration ??= new InteractivityConfiguration();
+		configuration ??= new();
 		var extension = new InteractivityExtension(configuration);
 		client.AddExtension(extension);
 
@@ -68,10 +68,8 @@ public static async Task<ReadOnlyDictionary<int, InteractivityExtension>> GetInt
 		var extensions = new Dictionary<int, InteractivityExtension>();
 
 		foreach (var shard in client.ShardClients.Select(xkvp => xkvp.Value))
-		{
 			extensions.Add(shard.ShardId, shard.GetExtension<InteractivityExtension>());
-		}
 
-		return new ReadOnlyDictionary<int, InteractivityExtension>(extensions);
+		return new(extensions);
 	}
 }
diff --git a/DisCatSharp.Interactivity/Extensions/InteractionExtensions.cs b/DisCatSharp.Interactivity/Extensions/InteractionExtensions.cs
index 61d56bd5fa..aaa18d6e93 100644
--- a/DisCatSharp.Interactivity/Extensions/InteractionExtensions.cs
+++ b/DisCatSharp.Interactivity/Extensions/InteractionExtensions.cs
@@ -64,27 +64,34 @@ public static async Task<PaginatedModalResponse> CreatePaginatedModalResponseAsy
 			{
 				await previousInteraction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, b.OpenMessage.AddComponents(b.OpenButton)).ConfigureAwait(false);
 				var originalResponse = await previousInteraction.GetOriginalResponseAsync().ConfigureAwait(false);
-				var modalOpen = await interactivity.WaitForButtonAsync(originalResponse, new List<DiscordButtonComponent> { b.OpenButton }, timeOutOverride).ConfigureAwait(false);
+				var modalOpen = await interactivity.WaitForButtonAsync(originalResponse, new List<DiscordButtonComponent>
+				{
+					b.OpenButton
+				}, timeOutOverride).ConfigureAwait(false);
 
 				if (modalOpen.TimedOut)
 				{
 					_ = previousInteraction.EditOriginalResponseAsync(new DiscordWebhookBuilder().WithContent(b.OpenMessage.Content).AddComponents(b.OpenButton.Disable()));
-					return new PaginatedModalResponse { TimedOut = true };
+					return new()
+					{
+						TimedOut = true
+					};
 				}
 
 				await modalOpen.Result.Interaction.CreateInteractionModalResponseAsync(modal).ConfigureAwait(false);
 			}
 			else
-			{
 				await previousInteraction.CreateInteractionModalResponseAsync(modal).ConfigureAwait(false);
-			}
 
 			_ = previousInteraction.EditOriginalResponseAsync(new DiscordWebhookBuilder().WithContent(b.OpenMessage.Content).AddComponents(b.OpenButton.Disable()));
 
 			var modalResult = await interactivity.WaitForModalAsync(modal.CustomId, timeOutOverride).ConfigureAwait(false);
 
 			if (modalResult.TimedOut)
-				return new PaginatedModalResponse { TimedOut = true };
+				return new()
+				{
+					TimedOut = true
+				};
 
 			foreach (var submissions in modalResult.Result.Interaction.Data.Components)
 				caughtResponses.Add(submissions.CustomId, submissions.Value);
@@ -94,6 +101,9 @@ public static async Task<PaginatedModalResponse> CreatePaginatedModalResponseAsy
 
 		await previousInteraction.CreateResponseAsync(InteractionResponseType.DeferredChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral()).ConfigureAwait(false);
 
-		return new PaginatedModalResponse { TimedOut = false, Responses = caughtResponses, Interaction = previousInteraction };
+		return new()
+		{
+			TimedOut = false, Responses = caughtResponses, Interaction = previousInteraction
+		};
 	}
 }
diff --git a/DisCatSharp.Interactivity/Extensions/MessageExtensions.cs b/DisCatSharp.Interactivity/Extensions/MessageExtensions.cs
index 7c8f44c7c5..6d056acab2 100644
--- a/DisCatSharp.Interactivity/Extensions/MessageExtensions.cs
+++ b/DisCatSharp.Interactivity/Extensions/MessageExtensions.cs
@@ -33,6 +33,7 @@ public static Task<InteractivityResult<DiscordMessage>> GetNextMessageAsync(this
 	/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 	public static Task<InteractivityResult<DiscordMessage>> GetNextMessageAsync(this DiscordMessage message, Func<DiscordMessage, bool> predicate, TimeSpan? timeoutOverride = null)
 		=> message.Channel.GetNextMessageAsync(msg => msg.Author.Id == message.Author.Id && message.ChannelId == msg.ChannelId && predicate(msg), timeoutOverride);
+
 	/// <summary>
 	/// Waits for any button to be pressed on the specified message.
 	/// </summary>
@@ -47,6 +48,7 @@ public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wai
 	/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 	public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(this DiscordMessage message, TimeSpan? timeoutOverride = null)
 		=> GetInteractivity(message).WaitForButtonAsync(message, timeoutOverride);
+
 	/// <summary>
 	/// Waits for any button to be pressed on the specified message.
 	/// </summary>
@@ -54,6 +56,7 @@ public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wai
 	/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 	public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(this DiscordMessage message, CancellationToken token)
 		=> GetInteractivity(message).WaitForButtonAsync(message, token);
+
 	/// <summary>
 	/// Waits for a button with the specified Id to be pressed on the specified message.
 	/// </summary>
@@ -119,7 +122,6 @@ public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wai
 	public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(this DiscordMessage message, Func<ComponentInteractionCreateEventArgs, bool> predicate, ComponentType selectType, TimeSpan? timeoutOverride = null)
 		=> GetInteractivity(message).WaitForSelectAsync(message, predicate, selectType, timeoutOverride);
 
-
 	/// <summary>
 	/// Waits for any dropdown to be interacted with.
 	/// </summary>
@@ -171,7 +173,7 @@ public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wai
 	/// <param name="selectType">The <see cref="ComponentType">type</see> of the select menu.</param>
 	/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 	public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(this DiscordMessage message, DiscordUser user, string id, ComponentType selectType, CancellationToken token)
-   => GetInteractivity(message).WaitForSelectAsync(message, user, id, selectType, token);
+		=> GetInteractivity(message).WaitForSelectAsync(message, user, id, selectType, token);
 
 	/// <summary>
 	/// Waits for a reaction on this message from a specific user.
@@ -203,7 +205,6 @@ public static Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReac
 	public static Task<ReadOnlyCollection<Reaction>> CollectReactionsAsync(this DiscordMessage message, TimeSpan? timeoutOverride = null)
 		=> GetInteractivity(message).CollectReactionsAsync(message, timeoutOverride);
 
-
 	/// <summary>
 	/// Begins a poll using this message.
 	/// </summary>
diff --git a/DisCatSharp.Interactivity/Helpers/InteractivityHelpers.cs b/DisCatSharp.Interactivity/Helpers/InteractivityHelpers.cs
index 0186b7bd62..da316d5b1c 100644
--- a/DisCatSharp.Interactivity/Helpers/InteractivityHelpers.cs
+++ b/DisCatSharp.Interactivity/Helpers/InteractivityHelpers.cs
@@ -18,6 +18,7 @@ public static List<Page> Recalculate(this List<Page> pages)
 			recalulatedPages.Add(tempPage);
 			pageCount++;
 		}
+
 		return recalulatedPages;
 	}
 }
diff --git a/DisCatSharp.Interactivity/InteractivityConfiguration.cs b/DisCatSharp.Interactivity/InteractivityConfiguration.cs
index 5be5c87180..bb75306018 100644
--- a/DisCatSharp.Interactivity/InteractivityConfiguration.cs
+++ b/DisCatSharp.Interactivity/InteractivityConfiguration.cs
@@ -68,8 +68,7 @@ public sealed class InteractivityConfiguration
 	/// </summary>
 	[ActivatorUtilitiesConstructor]
 	public InteractivityConfiguration()
-	{
-	}
+	{ }
 
 	/// <summary>
 	/// Creates a new instance of <see cref="InteractivityConfiguration"/>, copying the properties of another configuration.
diff --git a/DisCatSharp.Interactivity/InteractivityExtension.cs b/DisCatSharp.Interactivity/InteractivityExtension.cs
index 5eb7ed900f..ebdcc7b77a 100644
--- a/DisCatSharp.Interactivity/InteractivityExtension.cs
+++ b/DisCatSharp.Interactivity/InteractivityExtension.cs
@@ -19,7 +19,6 @@ namespace DisCatSharp.Interactivity;
 /// </summary>
 public class InteractivityExtension : BaseExtension
 {
-
 	/// <summary>
 	/// Gets the config.
 	/// </summary>
@@ -44,7 +43,7 @@ public class InteractivityExtension : BaseExtension
 	private Poller _poller;
 
 	private Paginator _paginator;
-	private  ComponentPaginator _compPaginator;
+	private ComponentPaginator _compPaginator;
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="InteractivityExtension"/> class.
@@ -52,7 +51,7 @@ public class InteractivityExtension : BaseExtension
 	/// <param name="cfg">The configuration.</param>
 	internal InteractivityExtension(InteractivityConfiguration cfg)
 	{
-		this.Config = new InteractivityConfiguration(cfg);
+		this.Config = new(cfg);
 	}
 
 	/// <summary>
@@ -62,18 +61,17 @@ internal InteractivityExtension(InteractivityConfiguration cfg)
 	protected internal override void Setup(DiscordClient client)
 	{
 		this.Client = client;
-		this._messageCreatedWaiter = new EventWaiter<MessageCreateEventArgs>(this.Client);
-		this._messageReactionAddWaiter = new EventWaiter<MessageReactionAddEventArgs>(this.Client);
-		this._componentInteractionWaiter = new EventWaiter<ComponentInteractionCreateEventArgs>(this.Client);
-		this._modalInteractionWaiter = new EventWaiter<ComponentInteractionCreateEventArgs>(this.Client);
-		this._typingStartWaiter = new EventWaiter<TypingStartEventArgs>(this.Client);
-		this._poller = new Poller(this.Client);
-		this._reactionCollector = new ReactionCollector(this.Client);
-		this._paginator = new Paginator(this.Client);
-		this._compPaginator = new ComponentPaginator(this.Client, this.Config);
-		this._componentEventWaiter = new ComponentEventWaiter(this.Client, this.Config);
-		this._modalEventWaiter = new ModalEventWaiter(this.Client, this.Config);
-
+		this._messageCreatedWaiter = new(this.Client);
+		this._messageReactionAddWaiter = new(this.Client);
+		this._componentInteractionWaiter = new(this.Client);
+		this._modalInteractionWaiter = new(this.Client);
+		this._typingStartWaiter = new(this.Client);
+		this._poller = new(this.Client);
+		this._reactionCollector = new(this.Client);
+		this._paginator = new(this.Client);
+		this._compPaginator = new(this.Client, this.Config);
+		this._componentEventWaiter = new(this.Client, this.Config);
+		this._modalEventWaiter = new(this.Client, this.Config);
 	}
 
 	/// <summary>
@@ -95,7 +93,7 @@ public async Task<ReadOnlyCollection<PollEmoji>> DoPollAsync(DiscordMessage m, I
 		foreach (var em in emojis)
 			await m.CreateReactionAsync(em).ConfigureAwait(false);
 
-		var res = await this._poller.DoPollAsync(new PollRequest(m, timeout ?? this.Config.Timeout, emojis)).ConfigureAwait(false);
+		var res = await this._poller.DoPollAsync(new(m, timeout ?? this.Config.Timeout, emojis)).ConfigureAwait(false);
 
 		var pollBehaviour = behaviour ?? this.Config.PollBehaviour;
 		var thisMember = await m.Channel.Guild.GetMemberAsync(this.Client.CurrentUser.Id).ConfigureAwait(false);
@@ -103,7 +101,7 @@ public async Task<ReadOnlyCollection<PollEmoji>> DoPollAsync(DiscordMessage m, I
 		if (pollBehaviour == PollBehaviour.DeleteEmojis && m.Channel.PermissionsFor(thisMember).HasPermission(Permissions.ManageMessages))
 			await m.DeleteAllReactionsAsync().ConfigureAwait(false);
 
-		return new ReadOnlyCollection<PollEmoji>(res.ToList());
+		return new(res.ToList());
 	}
 
 	/// <summary>
@@ -127,7 +125,7 @@ public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForBut
 	/// <returns>A <see cref="InteractivityResult{T}"/> with the result of button that was pressed, if any.</returns>
 	/// <exception cref="InvalidOperationException">Thrown when attempting to wait for a message that is not authored by the current user.</exception>
 	/// <exception cref="ArgumentException">Thrown when the message does not contain a button with the specified Id, or any buttons at all.</exception>
-																															public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, IEnumerable<DiscordButtonComponent> buttons, CancellationToken token)
+	public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, IEnumerable<DiscordButtonComponent> buttons, CancellationToken token)
 	{
 		if (message.Author != this.Client.CurrentUser)
 			throw new InvalidOperationException("Interaction events are only sent to the application that created them.");
@@ -142,12 +140,12 @@ public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wait
 			throw new ArgumentException("Provided Message does not contain any button components.");
 
 		var res = await this._componentEventWaiter
-			.WaitForMatchAsync(new ComponentMatchRequest(message,
+			.WaitForMatchAsync(new(message,
 				c =>
 					c.Interaction.Data.ComponentType == ComponentType.Button &&
 					buttons.Any(b => b.CustomId == c.Id), token)).ConfigureAwait(false);
 
-		return new InteractivityResult<ComponentInteractionCreateEventArgs>(res is null, res);
+		return new(res is null, res);
 	}
 
 	/// <summary>
@@ -156,8 +154,8 @@ public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wait
 	/// <param name="customId">The custom id of the modal to wait for.</param>
 	/// <param name="timeoutOverride">Override the timeout period specified in <see cref="InteractivityConfiguration"/>.</param>
 	/// <returns>A <see cref="InteractivityResult{T}"/> with the result of the modal.</returns>
-		public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForModalAsync(string customId, TimeSpan? timeoutOverride = null)
-			=> this.WaitForModalAsync(customId, this.GetCancellationToken(timeoutOverride));
+	public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForModalAsync(string customId, TimeSpan? timeoutOverride = null)
+		=> this.WaitForModalAsync(customId, this.GetCancellationToken(timeoutOverride));
 
 	/// <summary>
 	/// Waits for a user modal submit.
@@ -169,11 +167,11 @@ public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wait
 	{
 		var result =
 			await this
-			._modalEventWaiter
-			.WaitForModalMatchAsync(new ModalMatchRequest(customId, c => c.Interaction.Type == InteractionType.ModalSubmit, token))
-			.ConfigureAwait(false);
+				._modalEventWaiter
+				.WaitForModalMatchAsync(new(customId, c => c.Interaction.Type == InteractionType.ModalSubmit, token))
+				.ConfigureAwait(false);
 
-		return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
+		return new(result is null, result);
 	}
 
 	/// <summary>
@@ -210,11 +208,11 @@ public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wait
 
 		var result =
 			await this
-			._componentEventWaiter
-			.WaitForMatchAsync(new ComponentMatchRequest(message, c => c.Interaction.Data.ComponentType == ComponentType.Button && ids.Contains(c.Id), token))
-			.ConfigureAwait(false);
+				._componentEventWaiter
+				.WaitForMatchAsync(new(message, c => c.Interaction.Data.ComponentType == ComponentType.Button && ids.Contains(c.Id), token))
+				.ConfigureAwait(false);
 
-		return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
+		return new(result is null, result);
 	}
 
 	/// <summary>
@@ -251,11 +249,10 @@ public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wait
 
 		var result = await this
 			._componentEventWaiter
-			.WaitForMatchAsync(new ComponentMatchRequest(message, (c) => c.Interaction.Data.ComponentType is ComponentType.Button && c.User == user, token))
+			.WaitForMatchAsync(new(message, (c) => c.Interaction.Data.ComponentType is ComponentType.Button && c.User == user, token))
 			.ConfigureAwait(false);
 
-		return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
-
+		return new(result is null, result);
 	}
 
 	/// <summary>
@@ -292,12 +289,13 @@ public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wait
 
 		if (!message.Components.SelectMany(c => c.Components).OfType<DiscordButtonComponent>().Any(c => c.CustomId == id))
 			throw new ArgumentException($"Message does not contain button with Id of '{id}'.");
+
 		var result = await this
 			._componentEventWaiter
-			.WaitForMatchAsync(new ComponentMatchRequest(message, (c) => c.Interaction.Data.ComponentType is ComponentType.Button && c.Id == id, token))
+			.WaitForMatchAsync(new(message, (c) => c.Interaction.Data.ComponentType is ComponentType.Button && c.Id == id, token))
 			.ConfigureAwait(false);
 
-		return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
+		return new(result is null, result);
 	}
 
 	/// <summary>
@@ -328,13 +326,12 @@ public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wait
 
 		var result = await this
 			._componentEventWaiter
-			.WaitForMatchAsync(new ComponentMatchRequest(message, c => c.Interaction.Data.ComponentType is ComponentType.Button && predicate(c), token))
+			.WaitForMatchAsync(new(message, c => c.Interaction.Data.ComponentType is ComponentType.Button && predicate(c), token))
 			.ConfigureAwait(false);
 
-		return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
+		return new(result is null, result);
 	}
 
-
 	/// <summary>
 	/// Waits for any dropdown to be interacted with.
 	/// </summary>
@@ -367,10 +364,10 @@ public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wait
 
 		var result = await this
 			._componentEventWaiter
-			.WaitForMatchAsync(new ComponentMatchRequest(message, c => c.Interaction.Data.ComponentType == selectType && predicate(c), token))
+			.WaitForMatchAsync(new(message, c => c.Interaction.Data.ComponentType == selectType && predicate(c), token))
 			.ConfigureAwait(false);
 
-		return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
+		return new(result is null, result);
 	}
 
 	/// <summary>
@@ -409,10 +406,10 @@ public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wait
 
 		var result = await this
 			._componentEventWaiter
-			.WaitForMatchAsync(new ComponentMatchRequest(message, (c) => c.Interaction.Data.ComponentType == selectType && c.Id == id, token))
+			.WaitForMatchAsync(new(message, (c) => c.Interaction.Data.ComponentType == selectType && c.Id == id, token))
 			.ConfigureAwait(false);
 
-		return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
+		return new(result is null, result);
 	}
 
 	/// <summary>
@@ -452,27 +449,28 @@ public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> Wait
 
 		var result = await this
 			._componentEventWaiter
-			.WaitForMatchAsync(new ComponentMatchRequest(message, (c) => c.Id == id && c.User == user, token)).ConfigureAwait(false);
+			.WaitForMatchAsync(new(message, (c) => c.Id == id && c.User == user, token)).ConfigureAwait(false);
 
-		return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
+		return new(result is null, result);
 	}
 
-
 	/// <summary>
 	/// Waits for a specific message.
 	/// </summary>
 	/// <param name="predicate">Predicate to match.</param>
 	/// <param name="timeoutOverride">Override timeout period.</param>
-	public async Task<InteractivityResult<DiscordMessage>> WaitForMessageAsync(Func<DiscordMessage, bool> predicate,
-		TimeSpan? timeoutOverride = null)
+	public async Task<InteractivityResult<DiscordMessage>> WaitForMessageAsync(
+		Func<DiscordMessage, bool> predicate,
+		TimeSpan? timeoutOverride = null
+	)
 	{
 		if (!Utilities.HasMessageIntents(this.Client.Configuration.Intents))
 			throw new InvalidOperationException("No message intents are enabled.");
 
 		var timeout = timeoutOverride ?? this.Config.Timeout;
-		var returns = await this._messageCreatedWaiter.WaitForMatchAsync(new MatchRequest<MessageCreateEventArgs>(x => predicate(x.Message), timeout)).ConfigureAwait(false);
+		var returns = await this._messageCreatedWaiter.WaitForMatchAsync(new(x => predicate(x.Message), timeout)).ConfigureAwait(false);
 
-		return new InteractivityResult<DiscordMessage>(returns == null, returns?.Message);
+		return new(returns == null, returns?.Message);
 	}
 
 	/// <summary>
@@ -480,16 +478,18 @@ public async Task<InteractivityResult<DiscordMessage>> WaitForMessageAsync(Func<
 	/// </summary>
 	/// <param name="predicate">Predicate to match.</param>
 	/// <param name="timeoutOverride">Override timeout period.</param>
-	public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(Func<MessageReactionAddEventArgs, bool> predicate,
-		TimeSpan? timeoutOverride = null)
+	public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(
+		Func<MessageReactionAddEventArgs, bool> predicate,
+		TimeSpan? timeoutOverride = null
+	)
 	{
 		if (!Utilities.HasReactionIntents(this.Client.Configuration.Intents))
 			throw new InvalidOperationException("No reaction intents are enabled.");
 
 		var timeout = timeoutOverride ?? this.Config.Timeout;
-		var returns = await this._messageReactionAddWaiter.WaitForMatchAsync(new MatchRequest<MessageReactionAddEventArgs>(predicate, timeout)).ConfigureAwait(false);
+		var returns = await this._messageReactionAddWaiter.WaitForMatchAsync(new(predicate, timeout)).ConfigureAwait(false);
 
-		return new InteractivityResult<MessageReactionAddEventArgs>(returns == null, returns);
+		return new(returns == null, returns);
 	}
 
 	/// <summary>
@@ -499,8 +499,11 @@ public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReact
 	/// <param name="message">Message reaction was added to.</param>
 	/// <param name="user">User that made the reaction.</param>
 	/// <param name="timeoutOverride">Override timeout period.</param>
-	public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(DiscordMessage message, DiscordUser user,
-		TimeSpan? timeoutOverride = null)
+	public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(
+		DiscordMessage message,
+		DiscordUser user,
+		TimeSpan? timeoutOverride = null
+	)
 		=> await this.WaitForReactionAsync(x => x.User.Id == user.Id && x.Message.Id == message.Id, timeoutOverride).ConfigureAwait(false);
 
 	/// <summary>
@@ -511,8 +514,12 @@ public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReact
 	/// <param name="message">Message reaction was added to.</param>
 	/// <param name="user">User that made the reaction.</param>
 	/// <param name="timeoutOverride">Override timeout period.</param>
-	public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(Func<MessageReactionAddEventArgs, bool> predicate,
-		DiscordMessage message, DiscordUser user, TimeSpan? timeoutOverride = null)
+	public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(
+		Func<MessageReactionAddEventArgs, bool> predicate,
+		DiscordMessage message,
+		DiscordUser user,
+		TimeSpan? timeoutOverride = null
+	)
 		=> await this.WaitForReactionAsync(x => predicate(x) && x.User.Id == user.Id && x.Message.Id == message.Id, timeoutOverride).ConfigureAwait(false);
 
 	/// <summary>
@@ -522,8 +529,11 @@ public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReact
 	/// <param name="predicate">predicate to match.</param>
 	/// <param name="user">User that made the reaction.</param>
 	/// <param name="timeoutOverride">Override timeout period.</param>
-	public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(Func<MessageReactionAddEventArgs, bool> predicate,
-		DiscordUser user, TimeSpan? timeoutOverride = null)
+	public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(
+		Func<MessageReactionAddEventArgs, bool> predicate,
+		DiscordUser user,
+		TimeSpan? timeoutOverride = null
+	)
 		=> await this.WaitForReactionAsync(x => predicate(x) && x.User.Id == user.Id, timeoutOverride).ConfigureAwait(false);
 
 	/// <summary>
@@ -532,18 +542,21 @@ public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReact
 	/// <param name="user">User that starts typing.</param>
 	/// <param name="channel">Channel the user is typing in.</param>
 	/// <param name="timeoutOverride">Override timeout period.</param>
-	public async Task<InteractivityResult<TypingStartEventArgs>> WaitForUserTypingAsync(DiscordUser user,
-		DiscordChannel channel, TimeSpan? timeoutOverride = null)
+	public async Task<InteractivityResult<TypingStartEventArgs>> WaitForUserTypingAsync(
+		DiscordUser user,
+		DiscordChannel channel,
+		TimeSpan? timeoutOverride = null
+	)
 	{
 		if (!Utilities.HasTypingIntents(this.Client.Configuration.Intents))
 			throw new InvalidOperationException("No typing intents are enabled.");
 
 		var timeout = timeoutOverride ?? this.Config.Timeout;
 		var returns = await this._typingStartWaiter.WaitForMatchAsync(
-			new MatchRequest<TypingStartEventArgs>(x => x.User.Id == user.Id && x.Channel.Id == channel.Id, timeout))
+				new(x => x.User.Id == user.Id && x.Channel.Id == channel.Id, timeout))
 			.ConfigureAwait(false);
 
-		return new InteractivityResult<TypingStartEventArgs>(returns == null, returns);
+		return new(returns == null, returns);
 	}
 
 	/// <summary>
@@ -558,10 +571,10 @@ public async Task<InteractivityResult<TypingStartEventArgs>> WaitForUserTypingAs
 
 		var timeout = timeoutOverride ?? this.Config.Timeout;
 		var returns = await this._typingStartWaiter.WaitForMatchAsync(
-			new MatchRequest<TypingStartEventArgs>(x => x.User.Id == user.Id, timeout))
+				new(x => x.User.Id == user.Id, timeout))
 			.ConfigureAwait(false);
 
-		return new InteractivityResult<TypingStartEventArgs>(returns == null, returns);
+		return new(returns == null, returns);
 	}
 
 	/// <summary>
@@ -576,10 +589,10 @@ public async Task<InteractivityResult<TypingStartEventArgs>> WaitForTypingAsync(
 
 		var timeout = timeoutOverride ?? this.Config.Timeout;
 		var returns = await this._typingStartWaiter.WaitForMatchAsync(
-			new MatchRequest<TypingStartEventArgs>(x => x.Channel.Id == channel.Id, timeout))
+				new(x => x.Channel.Id == channel.Id, timeout))
 			.ConfigureAwait(false);
 
-		return new InteractivityResult<TypingStartEventArgs>(returns == null, returns);
+		return new(returns == null, returns);
 	}
 
 	/// <summary>
@@ -593,7 +606,7 @@ public async Task<ReadOnlyCollection<Reaction>> CollectReactionsAsync(DiscordMes
 			throw new InvalidOperationException("No reaction intents are enabled.");
 
 		var timeout = timeoutOverride ?? this.Config.Timeout;
-		var collection = await this._reactionCollector.CollectAsync(new ReactionCollectRequest(m, timeout)).ConfigureAwait(false);
+		var collection = await this._reactionCollector.CollectAsync(new(m, timeout)).ConfigureAwait(false);
 
 		return collection;
 	}
@@ -609,8 +622,8 @@ public async Task<InteractivityResult<T>> WaitForEventArgsAsync<T>(Func<T, bool>
 		var timeout = timeoutOverride ?? this.Config.Timeout;
 
 		using var waiter = new EventWaiter<T>(this.Client);
-		var res = await waiter.WaitForMatchAsync(new MatchRequest<T>(predicate, timeout)).ConfigureAwait(false);
-		return new InteractivityResult<T>(res == null, res);
+		var res = await waiter.WaitForMatchAsync(new(predicate, timeout)).ConfigureAwait(false);
+		return new(res == null, res);
 	}
 
 	/// <summary>
@@ -623,7 +636,7 @@ public async Task<ReadOnlyCollection<T>> CollectEventArgsAsync<T>(Func<T, bool>
 		var timeout = timeoutOverride ?? this.Config.Timeout;
 
 		using var waiter = new EventWaiter<T>(this.Client);
-		var res = await waiter.CollectMatchesAsync(new CollectRequest<T>(predicate, timeout)).ConfigureAwait(false);
+		var res = await waiter.CollectMatchesAsync(new(predicate, timeout)).ConfigureAwait(false);
 		return res;
 	}
 
@@ -638,14 +651,20 @@ public async Task<ReadOnlyCollection<T>> CollectEventArgsAsync<T>(Func<T, bool>
 	/// <param name="deletion">Deletion behaviour.</param>
 	/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 	public async Task SendPaginatedMessageAsync(
-		DiscordChannel channel, DiscordUser user, IEnumerable<Page> pages, PaginationButtons buttons,
-		PaginationBehaviour? behaviour = default, ButtonPaginationBehavior? deletion = default, CancellationToken token = default)
+		DiscordChannel channel,
+		DiscordUser user,
+		IEnumerable<Page> pages,
+		PaginationButtons buttons,
+		PaginationBehaviour? behaviour = default,
+		ButtonPaginationBehavior? deletion = default,
+		CancellationToken token = default
+	)
 	{
 		var bhv = behaviour ?? this.Config.PaginationBehaviour;
 		var del = deletion ?? this.Config.ButtonBehavior;
 		var bts = buttons ?? this.Config.PaginationButtons;
 
-		bts = new PaginationButtons(bts);
+		bts = new(bts);
 		if (bhv is PaginationBehaviour.Ignore)
 		{
 			bts.SkipLeft.Disable();
@@ -675,8 +694,14 @@ public async Task SendPaginatedMessageAsync(
 	/// <param name="deletion">Deletion behaviour.</param>
 	/// <param name="timeoutOverride">Override timeout period.</param>
 	public Task SendPaginatedMessageAsync(
-		DiscordChannel channel, DiscordUser user, IEnumerable<Page> pages, PaginationButtons buttons, TimeSpan? timeoutOverride,
-		PaginationBehaviour? behaviour = default, ButtonPaginationBehavior? deletion = default)
+		DiscordChannel channel,
+		DiscordUser user,
+		IEnumerable<Page> pages,
+		PaginationButtons buttons,
+		TimeSpan? timeoutOverride,
+		PaginationBehaviour? behaviour = default,
+		ButtonPaginationBehavior? deletion = default
+	)
 		=> this.SendPaginatedMessageAsync(channel, user, pages, buttons, behaviour, deletion, this.GetCancellationToken(timeoutOverride));
 
 	/// <summary>
@@ -716,8 +741,15 @@ public Task SendPaginatedMessageAsync(DiscordChannel channel, DiscordUser user,
 	/// <param name="behaviour">Pagination behaviour (when hitting max and min indices).</param>
 	/// <param name="deletion">Deletion behaviour.</param>
 	/// <param name="timeoutOverride">Override timeout period.</param>
-	public async Task SendPaginatedMessageAsync(DiscordChannel channel, DiscordUser user, IEnumerable<Page> pages, PaginationEmojis emojis,
-		PaginationBehaviour? behaviour = default, PaginationDeletion? deletion = default, TimeSpan? timeoutOverride = null)
+	public async Task SendPaginatedMessageAsync(
+		DiscordChannel channel,
+		DiscordUser user,
+		IEnumerable<Page> pages,
+		PaginationEmojis emojis,
+		PaginationBehaviour? behaviour = default,
+		PaginationDeletion? deletion = default,
+		TimeSpan? timeoutOverride = null
+	)
 	{
 		var builder = new DiscordMessageBuilder()
 			.WithContent(pages.First().Content)
@@ -756,7 +788,7 @@ public async Task SendPaginatedResponseAsync(DiscordInteraction interaction, boo
 		var del = deletion ?? this.Config.ButtonBehavior;
 		var bts = buttons ?? this.Config.PaginationButtons;
 
-		bts = new PaginationButtons(bts);
+		bts = new(bts);
 		if (bhv is PaginationBehaviour.Ignore)
 		{
 			bts.SkipLeft.Disable();
@@ -777,17 +809,17 @@ public async Task SendPaginatedResponseAsync(DiscordInteraction interaction, boo
 		if (deferred)
 		{
 			var builder = new DiscordWebhookBuilder()
-			.WithContent(pages.First().Content)
-			.AddEmbed(pages.First().Embed)
-			.AddComponents(bts.ButtonArray);
+				.WithContent(pages.First().Content)
+				.AddEmbed(pages.First().Embed)
+				.AddComponents(bts.ButtonArray);
 			message = await interaction.EditOriginalResponseAsync(builder).ConfigureAwait(false);
 		}
 		else
 		{
 			var builder = new DiscordInteractionResponseBuilder()
-			.WithContent(pages.First().Content)
-			.AddEmbed(pages.First().Embed)
-			.AddComponents(bts.ButtonArray);
+				.WithContent(pages.First().Content)
+				.AddEmbed(pages.First().Embed)
+				.AddComponents(bts.ButtonArray);
 			if (ephemeral)
 				builder = builder.AsEphemeral();
 			await interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder).ConfigureAwait(false);
@@ -799,7 +831,6 @@ public async Task SendPaginatedResponseAsync(DiscordInteraction interaction, boo
 		await this._compPaginator.DoPaginationAsync(req).ConfigureAwait(false);
 	}
 
-
 	/// <summary>
 	/// Waits for a custom pagination request to finish.
 	/// This does NOT handle removing emojis after finishing for you.
@@ -839,7 +870,7 @@ public IEnumerable<Page> GeneratePagesInContent(string input, SplitType splitTyp
 			case SplitType.Line:
 				var subsplit = input.Split('\n');
 
-				split = new List<string>();
+				split = new();
 				var s = "";
 
 				for (var i = 0; i < subsplit.Length; i++)
@@ -851,6 +882,7 @@ public IEnumerable<Page> GeneratePagesInContent(string input, SplitType splitTyp
 						s = "";
 					}
 				}
+
 				if (split.All(x => x != s))
 					split.Add(s);
 				break;
@@ -859,7 +891,7 @@ public IEnumerable<Page> GeneratePagesInContent(string input, SplitType splitTyp
 		var page = 1;
 		foreach (var s in split)
 		{
-			result.Add(new Page($"Page {page}:\n{s}"));
+			result.Add(new($"Page {page}:\n{s}"));
 			page++;
 		}
 
@@ -892,7 +924,7 @@ public IEnumerable<Page> GeneratePagesInEmbed(string input, SplitType splitType
 			case SplitType.Line:
 				var subsplit = input.Split('\n');
 
-				split = new List<string>();
+				split = new();
 				var s = "";
 
 				for (var i = 0; i < subsplit.Length; i++)
@@ -904,6 +936,7 @@ public IEnumerable<Page> GeneratePagesInEmbed(string input, SplitType splitType
 						s = "";
 					}
 				}
+
 				if (!split.Any(x => x == s))
 					split.Add(s);
 				break;
@@ -912,7 +945,7 @@ public IEnumerable<Page> GeneratePagesInEmbed(string input, SplitType splitType
 		var page = 1;
 		foreach (var s in split)
 		{
-			result.Add(new Page("", new DiscordEmbedBuilder(embed).WithDescription(s).WithFooter($"Page {page}/{split.Count}")));
+			result.Add(new("", new DiscordEmbedBuilder(embed).WithDescription(s).WithFooter($"Page {page}/{split.Count}")));
 			page++;
 		}
 
@@ -955,7 +988,10 @@ private async Task HandleInvalidInteraction(DiscordInteraction interaction)
 		var at = this.Config.ResponseBehavior switch
 		{
 			InteractionResponseBehavior.Ack => interaction.CreateResponseAsync(InteractionResponseType.DeferredMessageUpdate),
-			InteractionResponseBehavior.Respond => interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder { Content = this.Config.ResponseMessage, IsEphemeral = true}),
+			InteractionResponseBehavior.Respond => interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new()
+			{
+				Content = this.Config.ResponseMessage, IsEphemeral = true
+			}),
 			InteractionResponseBehavior.Ignore => Task.CompletedTask,
 			_ => throw new ArgumentException("Unknown enum value.")
 		};
diff --git a/DisCatSharp.Interactivity/InteractivityResult.cs b/DisCatSharp.Interactivity/InteractivityResult.cs
index 4749317c41..c0db7b8b4d 100644
--- a/DisCatSharp.Interactivity/InteractivityResult.cs
+++ b/DisCatSharp.Interactivity/InteractivityResult.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Interactivity;
 
 /// <summary>
@@ -11,6 +10,7 @@ public readonly struct InteractivityResult<T>
 	/// Whether interactivity was timed out
 	/// </summary>
 	public bool TimedOut { get; }
+
 	/// <summary>
 	/// Result
 	/// </summary>
diff --git a/DisCatSharp.Lavalink/DisCatSharp.Lavalink.csproj b/DisCatSharp.Lavalink/DisCatSharp.Lavalink.csproj
index 14ae416f24..734d68555e 100644
--- a/DisCatSharp.Lavalink/DisCatSharp.Lavalink.csproj
+++ b/DisCatSharp.Lavalink/DisCatSharp.Lavalink.csproj
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../DisCatSharp.Targets/Version.targets" />
-  <Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
-  <Import Project="../DisCatSharp.Targets/Package.targets" />
-  <Import Project="../DisCatSharp.Targets/NuGet.targets" />
-  <Import Project="../DisCatSharp.Targets/Library.targets" />
-  <Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
-
-  <PropertyGroup>
-	<AssemblyName>DisCatSharp.Lavalink</AssemblyName>
-	<RootNamespace>DisCatSharp.Lavalink</RootNamespace>
-	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <PropertyGroup>
-	<PackageId>DisCatSharp.Lavalink</PackageId>
-	<Description>
-	  DisCatSharp Lavalink V4 Extension
-
-	  Extend your bot with the full power of lavalink.
-	  Play your favorite music in discord!
-
-		Requires Lavalink Server v4
-
-	  Documentation: https://docs.dcs.aitsys.dev/articles/modules/audio/lavalink_v4/intro.html
-	</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Voice,Lavalink,Lavalink V4,Audio Player,Music,YouTube,Spotify,SoundCloud,Twitch,Vimeo,BandCamp,Apple Music,Yandex Music,Spotify,Spotify Recommendations,Deezer,Deezer ISRC,Local Music,Direct Url Music</PackageTags>
-	<Nullable>annotations</Nullable>
-  </PropertyGroup>
-  
-  <ItemGroup>
-	<ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-	<PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
-	  <PrivateAssets>all</PrivateAssets>
-	  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	</PackageReference>
-	<PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
-	<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
-	<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-  </ItemGroup>
+	<Import Project="../DisCatSharp.Targets/Version.targets" />
+	<Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
+	<Import Project="../DisCatSharp.Targets/Package.targets" />
+	<Import Project="../DisCatSharp.Targets/NuGet.targets" />
+	<Import Project="../DisCatSharp.Targets/Library.targets" />
+	<Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
+
+	<PropertyGroup>
+		<AssemblyName>DisCatSharp.Lavalink</AssemblyName>
+		<RootNamespace>DisCatSharp.Lavalink</RootNamespace>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<PackageId>DisCatSharp.Lavalink</PackageId>
+		<Description>
+			DisCatSharp Lavalink V4 Extension
+
+			Extend your bot with the full power of lavalink.
+			Play your favorite music in discord!
+
+			Requires Lavalink Server v4
+
+			Documentation: https://docs.dcs.aitsys.dev/articles/modules/audio/lavalink_v4/intro.html
+		</Description>
+		<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Voice,Lavalink,Lavalink V4,Audio Player,Music,YouTube,Spotify,SoundCloud,Twitch,Vimeo,BandCamp,Apple Music,Yandex Music,Spotify,Spotify Recommendations,Deezer,Deezer ISRC,Local Music,Direct Url Music</PackageTags>
+		<Nullable>annotations</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
+		<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+	</ItemGroup>
 
 </Project>
diff --git a/DisCatSharp.Lavalink/Entities/Filters/IPluginFilter.cs b/DisCatSharp.Lavalink/Entities/Filters/IPluginFilter.cs
index 10490bed2f..288decd711 100644
--- a/DisCatSharp.Lavalink/Entities/Filters/IPluginFilter.cs
+++ b/DisCatSharp.Lavalink/Entities/Filters/IPluginFilter.cs
@@ -1,10 +1,7 @@
-
 namespace DisCatSharp.Lavalink.Entities.Filters;
 
 /// <summary>
 /// Represents an plugin filter.
 /// </summary>
 public interface IPluginFilter
-{
-
-}
+{ }
diff --git a/DisCatSharp.Lavalink/Entities/Filters/LavalinkChannelMix.cs b/DisCatSharp.Lavalink/Entities/Filters/LavalinkChannelMix.cs
index 62f034d652..eef22201c1 100644
--- a/DisCatSharp.Lavalink/Entities/Filters/LavalinkChannelMix.cs
+++ b/DisCatSharp.Lavalink/Entities/Filters/LavalinkChannelMix.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Filters/LavalinkDisortion.cs b/DisCatSharp.Lavalink/Entities/Filters/LavalinkDisortion.cs
index 3a804351e6..98fd864307 100644
--- a/DisCatSharp.Lavalink/Entities/Filters/LavalinkDisortion.cs
+++ b/DisCatSharp.Lavalink/Entities/Filters/LavalinkDisortion.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Filters/LavalinkEqualizer.cs b/DisCatSharp.Lavalink/Entities/Filters/LavalinkEqualizer.cs
index a6c7e1764d..3f6eeadcc9 100644
--- a/DisCatSharp.Lavalink/Entities/Filters/LavalinkEqualizer.cs
+++ b/DisCatSharp.Lavalink/Entities/Filters/LavalinkEqualizer.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Lavalink.Enums.Filters;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Filters/LavalinkFilters.cs b/DisCatSharp.Lavalink/Entities/Filters/LavalinkFilters.cs
index ca558a7979..43c350e7a0 100644
--- a/DisCatSharp.Lavalink/Entities/Filters/LavalinkFilters.cs
+++ b/DisCatSharp.Lavalink/Entities/Filters/LavalinkFilters.cs
@@ -1,4 +1,3 @@
-
 using System.Collections.Generic;
 
 using DisCatSharp.Entities;
diff --git a/DisCatSharp.Lavalink/Entities/Filters/LavalinkKaraoke.cs b/DisCatSharp.Lavalink/Entities/Filters/LavalinkKaraoke.cs
index b7f8fa89ce..24aa1af9b4 100644
--- a/DisCatSharp.Lavalink/Entities/Filters/LavalinkKaraoke.cs
+++ b/DisCatSharp.Lavalink/Entities/Filters/LavalinkKaraoke.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Filters/LavalinkLowPass.cs b/DisCatSharp.Lavalink/Entities/Filters/LavalinkLowPass.cs
index 565522e334..21d8a5a9f9 100644
--- a/DisCatSharp.Lavalink/Entities/Filters/LavalinkLowPass.cs
+++ b/DisCatSharp.Lavalink/Entities/Filters/LavalinkLowPass.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Filters/LavalinkRotation.cs b/DisCatSharp.Lavalink/Entities/Filters/LavalinkRotation.cs
index 95dcaf3969..695f164c8a 100644
--- a/DisCatSharp.Lavalink/Entities/Filters/LavalinkRotation.cs
+++ b/DisCatSharp.Lavalink/Entities/Filters/LavalinkRotation.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Filters/LavalinkTimescale.cs b/DisCatSharp.Lavalink/Entities/Filters/LavalinkTimescale.cs
index b13ec1bec5..a3b9ef8ba6 100644
--- a/DisCatSharp.Lavalink/Entities/Filters/LavalinkTimescale.cs
+++ b/DisCatSharp.Lavalink/Entities/Filters/LavalinkTimescale.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Filters/LavalinkTremolo.cs b/DisCatSharp.Lavalink/Entities/Filters/LavalinkTremolo.cs
index 4ba062492f..c3b4730ecb 100644
--- a/DisCatSharp.Lavalink/Entities/Filters/LavalinkTremolo.cs
+++ b/DisCatSharp.Lavalink/Entities/Filters/LavalinkTremolo.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Filters/LavalinkVibrato.cs b/DisCatSharp.Lavalink/Entities/Filters/LavalinkVibrato.cs
index b2da6ee9ef..1d355b55f3 100644
--- a/DisCatSharp.Lavalink/Entities/Filters/LavalinkVibrato.cs
+++ b/DisCatSharp.Lavalink/Entities/Filters/LavalinkVibrato.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/IQueueEntry.cs b/DisCatSharp.Lavalink/Entities/IQueueEntry.cs
index f383cca6eb..c8c9b9a851 100644
--- a/DisCatSharp.Lavalink/Entities/IQueueEntry.cs
+++ b/DisCatSharp.Lavalink/Entities/IQueueEntry.cs
@@ -1,4 +1,3 @@
-
 using System.Threading.Tasks;
 
 namespace DisCatSharp.Lavalink.Entities;
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkException.cs b/DisCatSharp.Lavalink/Entities/LavalinkException.cs
index d0380ba65a..386d6c0526 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkException.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkException.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Lavalink.Enums;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkInfo.cs b/DisCatSharp.Lavalink/Entities/LavalinkInfo.cs
index c17ce237b7..a3e689669f 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkInfo.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkInfo.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 
@@ -22,6 +21,7 @@ public sealed class LavalinkInfo
 	/// </summary>
 	[JsonIgnore]
 	public DateTimeOffset BuildTime => Utilities.GetDateTimeOffsetFromMilliseconds(this._buildTime);
+
 	/// <summary>
 	/// Gets the timestamp when this version was built.
 	/// </summary>
@@ -158,4 +158,3 @@ public sealed class Version
 	[JsonProperty("build")]
 	public string? Build { get; internal set; }
 }
-
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkPlayer.cs b/DisCatSharp.Lavalink/Entities/LavalinkPlayer.cs
index 34a54709d3..e3f99625df 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkPlayer.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkPlayer.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Lavalink.Entities.Filters;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkPlayerState.cs b/DisCatSharp.Lavalink/Entities/LavalinkPlayerState.cs
index 348702e893..acfc3cb0e4 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkPlayerState.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkPlayerState.cs
@@ -1,4 +1,3 @@
-
 using System;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkPlaylist.cs b/DisCatSharp.Lavalink/Entities/LavalinkPlaylist.cs
index 8f55ce4829..a55029e408 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkPlaylist.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkPlaylist.cs
@@ -1,4 +1,3 @@
-
 using System.Collections.Generic;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkPlaylistInfo.cs b/DisCatSharp.Lavalink/Entities/LavalinkPlaylistInfo.cs
index 5749be3652..78740877df 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkPlaylistInfo.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkPlaylistInfo.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Entities;
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkRestResponse.cs b/DisCatSharp.Lavalink/Entities/LavalinkRestResponse.cs
index f649217bfd..7d9b201e3d 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkRestResponse.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkRestResponse.cs
@@ -1,4 +1,3 @@
-
 using System.Net;
 using System.Net.Http.Headers;
 
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkSessionConfiguration.cs b/DisCatSharp.Lavalink/Entities/LavalinkSessionConfiguration.cs
index c6ec7eb03b..21dbf0e0c9 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkSessionConfiguration.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkSessionConfiguration.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkStats.cs b/DisCatSharp.Lavalink/Entities/LavalinkStats.cs
index 189c74fdcb..79da5ba39b 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkStats.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkStats.cs
@@ -1,4 +1,3 @@
-
 using System;
 
 using DisCatSharp.Lavalink.Entities.Websocket;
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkTrack.cs b/DisCatSharp.Lavalink/Entities/LavalinkTrack.cs
index bde437acff..2f3d7f93af 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkTrack.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkTrack.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 
@@ -81,6 +80,7 @@ public sealed class LavalinkTrackInfo
 	/// </summary>
 	[JsonIgnore]
 	public TimeSpan Length => !this.IsStream ? TimeSpan.FromMilliseconds(this.LengthInternal) : TimeSpan.Zero;
+
 	[JsonProperty("length")]
 	internal long LengthInternal;
 
@@ -95,6 +95,7 @@ public sealed class LavalinkTrackInfo
 	/// </summary>
 	[JsonIgnore]
 	public TimeSpan Position => TimeSpan.FromMilliseconds(this.PositionInternal);
+
 	[JsonProperty("position")]
 	internal long PositionInternal;
 
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkTrackLoadingResult.cs b/DisCatSharp.Lavalink/Entities/LavalinkTrackLoadingResult.cs
index dd16fd540b..ec7eaa98a7 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkTrackLoadingResult.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkTrackLoadingResult.cs
@@ -1,4 +1,3 @@
-
 using System.Collections.Generic;
 using System.IO;
 
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkVoiceState.cs b/DisCatSharp.Lavalink/Entities/LavalinkVoiceState.cs
index bfccca6ed1..5fd0216f82 100644
--- a/DisCatSharp.Lavalink/Entities/LavalinkVoiceState.cs
+++ b/DisCatSharp.Lavalink/Entities/LavalinkVoiceState.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Entities;
diff --git a/DisCatSharp.Lavalink/Entities/Websocket/EventOP.cs b/DisCatSharp.Lavalink/Entities/Websocket/EventOP.cs
index f47dba4079..2df1198e43 100644
--- a/DisCatSharp.Lavalink/Entities/Websocket/EventOP.cs
+++ b/DisCatSharp.Lavalink/Entities/Websocket/EventOP.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Lavalink.Enums.Websocket;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Websocket/LavalinkOp.cs b/DisCatSharp.Lavalink/Entities/Websocket/LavalinkOp.cs
index 83d8cb4a19..4eac00c3ad 100644
--- a/DisCatSharp.Lavalink/Entities/Websocket/LavalinkOp.cs
+++ b/DisCatSharp.Lavalink/Entities/Websocket/LavalinkOp.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Lavalink.Enums.Websocket;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Websocket/PlayerUpdateOp.cs b/DisCatSharp.Lavalink/Entities/Websocket/PlayerUpdateOp.cs
index a9e6fbdca4..6a6b21954b 100644
--- a/DisCatSharp.Lavalink/Entities/Websocket/PlayerUpdateOp.cs
+++ b/DisCatSharp.Lavalink/Entities/Websocket/PlayerUpdateOp.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Entities.Websocket;
diff --git a/DisCatSharp.Lavalink/Entities/Websocket/ReadyOp.cs b/DisCatSharp.Lavalink/Entities/Websocket/ReadyOp.cs
index 3a097dd94a..5f4905639f 100644
--- a/DisCatSharp.Lavalink/Entities/Websocket/ReadyOp.cs
+++ b/DisCatSharp.Lavalink/Entities/Websocket/ReadyOp.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Entities.Websocket;
diff --git a/DisCatSharp.Lavalink/Entities/Websocket/StatsOp.cs b/DisCatSharp.Lavalink/Entities/Websocket/StatsOp.cs
index 5cf345eccc..7922996bf4 100644
--- a/DisCatSharp.Lavalink/Entities/Websocket/StatsOp.cs
+++ b/DisCatSharp.Lavalink/Entities/Websocket/StatsOp.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Entities.Websocket;
diff --git a/DisCatSharp.Lavalink/Entities/Websocket/TrackEndEvent.cs b/DisCatSharp.Lavalink/Entities/Websocket/TrackEndEvent.cs
index d201b23d8a..c5439fc4f3 100644
--- a/DisCatSharp.Lavalink/Entities/Websocket/TrackEndEvent.cs
+++ b/DisCatSharp.Lavalink/Entities/Websocket/TrackEndEvent.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Lavalink.Enums;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Websocket/TrackException.cs b/DisCatSharp.Lavalink/Entities/Websocket/TrackException.cs
index 4c49db769f..765f7b775a 100644
--- a/DisCatSharp.Lavalink/Entities/Websocket/TrackException.cs
+++ b/DisCatSharp.Lavalink/Entities/Websocket/TrackException.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Lavalink.Enums;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Entities/Websocket/TrackExceptionEvent.cs b/DisCatSharp.Lavalink/Entities/Websocket/TrackExceptionEvent.cs
index 87e9ac6bc2..28b76beb2e 100644
--- a/DisCatSharp.Lavalink/Entities/Websocket/TrackExceptionEvent.cs
+++ b/DisCatSharp.Lavalink/Entities/Websocket/TrackExceptionEvent.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Entities.Websocket;
diff --git a/DisCatSharp.Lavalink/Entities/Websocket/TrackStartEvent.cs b/DisCatSharp.Lavalink/Entities/Websocket/TrackStartEvent.cs
index 1a3cd32584..c8f7bda966 100644
--- a/DisCatSharp.Lavalink/Entities/Websocket/TrackStartEvent.cs
+++ b/DisCatSharp.Lavalink/Entities/Websocket/TrackStartEvent.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Entities.Websocket;
diff --git a/DisCatSharp.Lavalink/Entities/Websocket/TrackStuckEvent.cs b/DisCatSharp.Lavalink/Entities/Websocket/TrackStuckEvent.cs
index 7433ae9340..e8581dffb5 100644
--- a/DisCatSharp.Lavalink/Entities/Websocket/TrackStuckEvent.cs
+++ b/DisCatSharp.Lavalink/Entities/Websocket/TrackStuckEvent.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Entities.Websocket;
diff --git a/DisCatSharp.Lavalink/Entities/Websocket/WebSocketClosedEvent.cs b/DisCatSharp.Lavalink/Entities/Websocket/WebSocketClosedEvent.cs
index f65220097b..683a763ff0 100644
--- a/DisCatSharp.Lavalink/Entities/Websocket/WebSocketClosedEvent.cs
+++ b/DisCatSharp.Lavalink/Entities/Websocket/WebSocketClosedEvent.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Entities.Websocket;
diff --git a/DisCatSharp.Lavalink/Enums/Filters/LavalinkFilterBand.cs b/DisCatSharp.Lavalink/Enums/Filters/LavalinkFilterBand.cs
index fdd4bf5431..9d1e974bb5 100644
--- a/DisCatSharp.Lavalink/Enums/Filters/LavalinkFilterBand.cs
+++ b/DisCatSharp.Lavalink/Enums/Filters/LavalinkFilterBand.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Lavalink.Enums.Filters;
 
 /// <summary>
diff --git a/DisCatSharp.Lavalink/Enums/LavalinkEvents.cs b/DisCatSharp.Lavalink/Enums/LavalinkEvents.cs
index e0d1cfd829..f811fa7732 100644
--- a/DisCatSharp.Lavalink/Enums/LavalinkEvents.cs
+++ b/DisCatSharp.Lavalink/Enums/LavalinkEvents.cs
@@ -1,4 +1,3 @@
-
 using Microsoft.Extensions.Logging;
 
 namespace DisCatSharp.Lavalink.Enums;
diff --git a/DisCatSharp.Lavalink/Enums/LavalinkLoadResultType.cs b/DisCatSharp.Lavalink/Enums/LavalinkLoadResultType.cs
index 9a6ca02456..9498823d33 100644
--- a/DisCatSharp.Lavalink/Enums/LavalinkLoadResultType.cs
+++ b/DisCatSharp.Lavalink/Enums/LavalinkLoadResultType.cs
@@ -1,4 +1,3 @@
-
 using System.Runtime.Serialization;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Enums/LavalinkRestEndpoints.cs b/DisCatSharp.Lavalink/Enums/LavalinkRestEndpoints.cs
index bb1c89cbef..db7a7a9e84 100644
--- a/DisCatSharp.Lavalink/Enums/LavalinkRestEndpoints.cs
+++ b/DisCatSharp.Lavalink/Enums/LavalinkRestEndpoints.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Lavalink.Enums;
 
 /// <summary>
@@ -10,18 +9,22 @@ internal static class Endpoints
 	/// The version endpoint.
 	/// </summary>
 	internal const string VERSION = "/version";
+
 	/// <summary>
 	/// The websocket endpoint.
 	/// </summary>
 	internal const string WEBSOCKET = "/websocket";
+
 	/// <summary>
 	/// The v4 endpoint.
 	/// </summary>
 	internal const string V4 = "/v4";
+
 	/// <summary>
 	/// The info endpoint.
 	/// </summary>
 	internal const string INFO = "/info";
+
 	/// <summary>
 	/// The stats endpoint.
 	/// </summary>
@@ -32,6 +35,7 @@ internal static class Endpoints
 	/// THe sessions endpoint.
 	/// </summary>
 	internal const string SESSIONS = "/sessions";
+
 	/// <summary>
 	/// The players endpoint.
 	/// </summary>
@@ -42,10 +46,12 @@ internal static class Endpoints
 	/// The load tracks endpoint.
 	/// </summary>
 	internal const string LOAD_TRACKS = "/loadtracks";
+
 	/// <summary>
 	/// The decode track endpoint.
 	/// </summary>
 	internal const string DECODE_TRACK = "/decodetrack";
+
 	/// <summary>
 	/// The decode tracks endpoint.
 	/// </summary>
@@ -56,14 +62,17 @@ internal static class Endpoints
 	/// The route planner endpoint.
 	/// </summary>
 	internal const string ROUTE_PLANNER = "/routeplanner";
+
 	/// <summary>
 	/// The status endpoint.
 	/// </summary>
 	internal const string STATUS = "/status";
+
 	/// <summary>
 	/// The free address endpoint.
 	/// </summary>
 	internal const string FREE_ADDRESS = "/free/address";
+
 	/// <summary>
 	/// The free all endpoint.
 	/// </summary>
diff --git a/DisCatSharp.Lavalink/Enums/LavalinkSearchType.cs b/DisCatSharp.Lavalink/Enums/LavalinkSearchType.cs
index 876d5bc09c..c18648c3d6 100644
--- a/DisCatSharp.Lavalink/Enums/LavalinkSearchType.cs
+++ b/DisCatSharp.Lavalink/Enums/LavalinkSearchType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Lavalink.Enums;
 
 /// <summary>
diff --git a/DisCatSharp.Lavalink/Enums/LavalinkTrackEndReason.cs b/DisCatSharp.Lavalink/Enums/LavalinkTrackEndReason.cs
index 7430f97445..bcbd289bda 100644
--- a/DisCatSharp.Lavalink/Enums/LavalinkTrackEndReason.cs
+++ b/DisCatSharp.Lavalink/Enums/LavalinkTrackEndReason.cs
@@ -1,4 +1,3 @@
-
 using System.Runtime.Serialization;
 
 using DisCatSharp.Lavalink.Entities;
diff --git a/DisCatSharp.Lavalink/Enums/Severity.cs b/DisCatSharp.Lavalink/Enums/Severity.cs
index 1579ee1030..743b18b167 100644
--- a/DisCatSharp.Lavalink/Enums/Severity.cs
+++ b/DisCatSharp.Lavalink/Enums/Severity.cs
@@ -1,4 +1,3 @@
-
 using System.Runtime.Serialization;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Enums/Websocket/EventOpType.cs b/DisCatSharp.Lavalink/Enums/Websocket/EventOpType.cs
index 35f324fffe..e1628b708b 100644
--- a/DisCatSharp.Lavalink/Enums/Websocket/EventOpType.cs
+++ b/DisCatSharp.Lavalink/Enums/Websocket/EventOpType.cs
@@ -1,4 +1,3 @@
-
 using System.Runtime.Serialization;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Enums/Websocket/OpType.cs b/DisCatSharp.Lavalink/Enums/Websocket/OpType.cs
index 9c4911b4b4..d5589b768b 100644
--- a/DisCatSharp.Lavalink/Enums/Websocket/OpType.cs
+++ b/DisCatSharp.Lavalink/Enums/Websocket/OpType.cs
@@ -1,4 +1,3 @@
-
 using System.Runtime.Serialization;
 
 using DisCatSharp.Lavalink.Entities;
diff --git a/DisCatSharp.Lavalink/EventArgs/GuildPlayerDestroyedEventArgs.cs b/DisCatSharp.Lavalink/EventArgs/GuildPlayerDestroyedEventArgs.cs
index 14d9f94665..bfc07222ee 100644
--- a/DisCatSharp.Lavalink/EventArgs/GuildPlayerDestroyedEventArgs.cs
+++ b/DisCatSharp.Lavalink/EventArgs/GuildPlayerDestroyedEventArgs.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 using DisCatSharp.EventArgs;
 
diff --git a/DisCatSharp.Lavalink/EventArgs/LavalinkPlayerStateUpdateEventArgs.cs b/DisCatSharp.Lavalink/EventArgs/LavalinkPlayerStateUpdateEventArgs.cs
index eb5a7f405f..8e08c45cf9 100644
--- a/DisCatSharp.Lavalink/EventArgs/LavalinkPlayerStateUpdateEventArgs.cs
+++ b/DisCatSharp.Lavalink/EventArgs/LavalinkPlayerStateUpdateEventArgs.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.EventArgs;
 using DisCatSharp.Lavalink.Entities;
 
diff --git a/DisCatSharp.Lavalink/EventArgs/LavalinkSessionConnectedEventArgs.cs b/DisCatSharp.Lavalink/EventArgs/LavalinkSessionConnectedEventArgs.cs
index 22c1a5ad8f..78c5d9ac09 100644
--- a/DisCatSharp.Lavalink/EventArgs/LavalinkSessionConnectedEventArgs.cs
+++ b/DisCatSharp.Lavalink/EventArgs/LavalinkSessionConnectedEventArgs.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.EventArgs;
 
 namespace DisCatSharp.Lavalink.EventArgs;
diff --git a/DisCatSharp.Lavalink/EventArgs/LavalinkSessionDisconnectedEventArgs.cs b/DisCatSharp.Lavalink/EventArgs/LavalinkSessionDisconnectedEventArgs.cs
index 6b88633a2a..ae3ffd4fec 100644
--- a/DisCatSharp.Lavalink/EventArgs/LavalinkSessionDisconnectedEventArgs.cs
+++ b/DisCatSharp.Lavalink/EventArgs/LavalinkSessionDisconnectedEventArgs.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.EventArgs;
 
 namespace DisCatSharp.Lavalink.EventArgs;
diff --git a/DisCatSharp.Lavalink/EventArgs/LavalinkStatsReceivedEventArgs.cs b/DisCatSharp.Lavalink/EventArgs/LavalinkStatsReceivedEventArgs.cs
index 27c764c8fe..4b981c6701 100644
--- a/DisCatSharp.Lavalink/EventArgs/LavalinkStatsReceivedEventArgs.cs
+++ b/DisCatSharp.Lavalink/EventArgs/LavalinkStatsReceivedEventArgs.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.EventArgs;
 using DisCatSharp.Lavalink.Entities;
 
diff --git a/DisCatSharp.Lavalink/EventArgs/LavalinkTrackEndedEventArgs.cs b/DisCatSharp.Lavalink/EventArgs/LavalinkTrackEndedEventArgs.cs
index eaee302e7f..cce4e1d8be 100644
--- a/DisCatSharp.Lavalink/EventArgs/LavalinkTrackEndedEventArgs.cs
+++ b/DisCatSharp.Lavalink/EventArgs/LavalinkTrackEndedEventArgs.cs
@@ -1,4 +1,3 @@
-
 using System;
 
 using DisCatSharp.Entities;
diff --git a/DisCatSharp.Lavalink/EventArgs/LavalinkTrackExceptionEventArgs.cs b/DisCatSharp.Lavalink/EventArgs/LavalinkTrackExceptionEventArgs.cs
index 2cde5a0fac..63ba1d67f4 100644
--- a/DisCatSharp.Lavalink/EventArgs/LavalinkTrackExceptionEventArgs.cs
+++ b/DisCatSharp.Lavalink/EventArgs/LavalinkTrackExceptionEventArgs.cs
@@ -1,4 +1,3 @@
-
 using System;
 
 using DisCatSharp.Entities;
@@ -51,9 +50,7 @@ internal LavalinkTrackExceptionEventArgs(DiscordClient client, TrackExceptionEve
 		this.Track = eventArgs.Track;
 		this.Exception = new()
 		{
-			Message = eventArgs.Exception.Message,
-			Severity = eventArgs.Exception.Severity,
-			Cause = eventArgs.Exception.Cause
+			Message = eventArgs.Exception.Message, Severity = eventArgs.Exception.Severity, Cause = eventArgs.Exception.Cause
 		};
 		this.GuildId = Convert.ToUInt64(eventArgs.GuildId);
 	}
diff --git a/DisCatSharp.Lavalink/EventArgs/LavalinkTrackStartedEventArgs.cs b/DisCatSharp.Lavalink/EventArgs/LavalinkTrackStartedEventArgs.cs
index b035aadc7c..a852c14750 100644
--- a/DisCatSharp.Lavalink/EventArgs/LavalinkTrackStartedEventArgs.cs
+++ b/DisCatSharp.Lavalink/EventArgs/LavalinkTrackStartedEventArgs.cs
@@ -1,4 +1,3 @@
-
 using System;
 
 using DisCatSharp.Entities;
diff --git a/DisCatSharp.Lavalink/EventArgs/LavalinkTrackStuckEventArgs.cs b/DisCatSharp.Lavalink/EventArgs/LavalinkTrackStuckEventArgs.cs
index 80a1b1e936..d3e6881a01 100644
--- a/DisCatSharp.Lavalink/EventArgs/LavalinkTrackStuckEventArgs.cs
+++ b/DisCatSharp.Lavalink/EventArgs/LavalinkTrackStuckEventArgs.cs
@@ -1,4 +1,3 @@
-
 using System;
 
 using DisCatSharp.Entities;
diff --git a/DisCatSharp.Lavalink/EventArgs/LavalinkWebsocketClosedEventArgs.cs b/DisCatSharp.Lavalink/EventArgs/LavalinkWebsocketClosedEventArgs.cs
index 75b2b6e732..3009434f99 100644
--- a/DisCatSharp.Lavalink/EventArgs/LavalinkWebsocketClosedEventArgs.cs
+++ b/DisCatSharp.Lavalink/EventArgs/LavalinkWebsocketClosedEventArgs.cs
@@ -1,4 +1,3 @@
-
 using System;
 
 using DisCatSharp.Entities;
diff --git a/DisCatSharp.Lavalink/Exceptions/LavalinkRestException.cs b/DisCatSharp.Lavalink/Exceptions/LavalinkRestException.cs
index 7526250db1..01fbcd8ff6 100644
--- a/DisCatSharp.Lavalink/Exceptions/LavalinkRestException.cs
+++ b/DisCatSharp.Lavalink/Exceptions/LavalinkRestException.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.Net;
 using System.Net.Http.Headers;
@@ -17,6 +16,7 @@ public sealed class LavalinkRestException : Exception
 	/// </summary>
 	[JsonIgnore]
 	public DateTimeOffset Timestamp => Utilities.GetDateTimeOffsetFromMilliseconds(this._timestamp);
+
 	[JsonProperty("timestamp")]
 #pragma warning disable CS0649 // Field 'LavalinkRestException._timestamp' is never assigned to, and will always have its default value 0
 	private readonly long _timestamp;
diff --git a/DisCatSharp.Lavalink/ExtensionMethods.cs b/DisCatSharp.Lavalink/ExtensionMethods.cs
index 3a6eba1480..8c847327fe 100644
--- a/DisCatSharp.Lavalink/ExtensionMethods.cs
+++ b/DisCatSharp.Lavalink/ExtensionMethods.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/DisCatSharp.Lavalink/GlobalSuppressions.cs b/DisCatSharp.Lavalink/GlobalSuppressions.cs
index be9d48287a..db87553648 100644
--- a/DisCatSharp.Lavalink/GlobalSuppressions.cs
+++ b/DisCatSharp.Lavalink/GlobalSuppressions.cs
@@ -1,4 +1,3 @@
-
 using System.Diagnostics.CodeAnalysis;
 
 [assembly: SuppressMessage("Usage", "DCS0102:[Discord] Deprecated", Justification = "<Pending>")]
diff --git a/DisCatSharp.Lavalink/LavalinkConfiguration.cs b/DisCatSharp.Lavalink/LavalinkConfiguration.cs
index b03d43b3cb..cc30fda50b 100644
--- a/DisCatSharp.Lavalink/LavalinkConfiguration.cs
+++ b/DisCatSharp.Lavalink/LavalinkConfiguration.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.Net;
 
@@ -110,15 +109,11 @@ public LavalinkConfiguration(LavalinkConfiguration other)
 	{
 		this.RestEndpoint = new()
 		{
-			Hostname = other.RestEndpoint.Hostname,
-			Port = other.RestEndpoint.Port,
-			Secured = other.RestEndpoint.Secured
+			Hostname = other.RestEndpoint.Hostname, Port = other.RestEndpoint.Port, Secured = other.RestEndpoint.Secured
 		};
 		this.SocketEndpoint = new()
 		{
-			Hostname = other.SocketEndpoint.Hostname,
-			Port = other.SocketEndpoint.Port,
-			Secured = other.SocketEndpoint.Secured
+			Hostname = other.SocketEndpoint.Hostname, Port = other.SocketEndpoint.Port, Secured = other.SocketEndpoint.Secured
 		};
 		this.Password = other.Password;
 		this.SessionId = other.SessionId;
diff --git a/DisCatSharp.Lavalink/LavalinkExtension.cs b/DisCatSharp.Lavalink/LavalinkExtension.cs
index 8b636a23e8..f88e4df23c 100644
--- a/DisCatSharp.Lavalink/LavalinkExtension.cs
+++ b/DisCatSharp.Lavalink/LavalinkExtension.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -25,6 +24,7 @@ public event AsyncEventHandler<LavalinkExtension, LavalinkSessionDisconnectedEve
 		add => this._sessionDisconnected.Register(value);
 		remove => this._sessionDisconnected.Unregister(value);
 	}
+
 	private AsyncEvent<LavalinkExtension, LavalinkSessionDisconnectedEventArgs> _sessionDisconnected;
 
 	/// <summary>
@@ -35,6 +35,7 @@ public event AsyncEventHandler<LavalinkExtension, LavalinkSessionConnectedEventA
 		add => this._sessionConnected.Register(value);
 		remove => this._sessionConnected.Unregister(value);
 	}
+
 	private AsyncEvent<LavalinkExtension, LavalinkSessionConnectedEventArgs> _sessionConnected;
 
 	/// <summary>
@@ -80,7 +81,6 @@ protected internal override void Setup(DiscordClient client)
 		this._sessionConnected = new("LAVALINK_SESSION_CONNECTED", TimeSpan.Zero, this.Client.EventErrorHandler);
 	}
 
-
 	/// <summary>
 	/// Connect to a Lavalink session.
 	/// </summary>
@@ -100,6 +100,7 @@ public async Task<LavalinkSession> ConnectAsync(LavalinkConfiguration config)
 			var versionInfo = await this.REST.GetVersionAsync().ConfigureAwait(false);
 			if (!versionInfo.Headers.Contains("Lavalink-Api-Version"))
 				throw new("Lavalink v4 is required");
+
 			if (versionInfo.Headers.TryGetValues("Lavalink-Api-Version", out var headerValues))
 				if (headerValues.First() != "4")
 					throw new("Lavalink v4 is required");
@@ -183,27 +184,27 @@ private LavalinkSession FilterByLoad(LavalinkSession[] sessions)
 			var bPenaltyCount = b.Statistics.PlayingPlayers;
 
 			//cpu load
-			aPenaltyCount += (int)Math.Pow(1.05d, (100 * (a.Statistics.Cpu.SystemLoad / a.Statistics.Cpu.Cores) * 10) - 10);
-			bPenaltyCount += (int)Math.Pow(1.05d, (100 * (b.Statistics.Cpu.SystemLoad / a.Statistics.Cpu.Cores) * 10) - 10);
+			aPenaltyCount += (int)Math.Pow(1.05d, 100 * (a.Statistics.Cpu.SystemLoad / a.Statistics.Cpu.Cores) * 10 - 10);
+			bPenaltyCount += (int)Math.Pow(1.05d, 100 * (b.Statistics.Cpu.SystemLoad / a.Statistics.Cpu.Cores) * 10 - 10);
 
 			//frame load
 			if (a.Statistics.Frames!.Deficit > 0)
 			{
 				//deficit frame load
-				aPenaltyCount += (int)((Math.Pow(1.03d, 500f * (a.Statistics.Frames.Deficit / 3000f)) * 600) - 600);
+				aPenaltyCount += (int)(Math.Pow(1.03d, 500f * (a.Statistics.Frames.Deficit / 3000f)) * 600 - 600);
 
 				//null frame load
-				aPenaltyCount += (int)((Math.Pow(1.03d, 500f * (a.Statistics.Frames.Deficit / 3000f)) * 300) - 300);
+				aPenaltyCount += (int)(Math.Pow(1.03d, 500f * (a.Statistics.Frames.Deficit / 3000f)) * 300 - 300);
 			}
 
 			//frame load
 			if (b.Statistics.Frames!.Deficit > 0)
 			{
 				//deficit frame load
-				bPenaltyCount += (int)((Math.Pow(1.03d, 500f * (b.Statistics.Frames.Deficit / 3000f)) * 600) - 600);
+				bPenaltyCount += (int)(Math.Pow(1.03d, 500f * (b.Statistics.Frames.Deficit / 3000f)) * 600 - 600);
 
 				//null frame load
-				bPenaltyCount += (int)((Math.Pow(1.03d, 500f * (b.Statistics.Frames.Deficit / 3000f)) * 300) - 300);
+				bPenaltyCount += (int)(Math.Pow(1.03d, 500f * (b.Statistics.Frames.Deficit / 3000f)) * 300 - 300);
 			}
 
 			return aPenaltyCount - bPenaltyCount;
diff --git a/DisCatSharp.Lavalink/LavalinkGuildPlayer.cs b/DisCatSharp.Lavalink/LavalinkGuildPlayer.cs
index 257d630a69..6d2196a544 100644
--- a/DisCatSharp.Lavalink/LavalinkGuildPlayer.cs
+++ b/DisCatSharp.Lavalink/LavalinkGuildPlayer.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -34,6 +33,7 @@ internal event AsyncEventHandler<DiscordClient, VoiceStateUpdateEventArgs> Voice
 		add => this._voiceStateUpdated.Register(value);
 		remove => this._voiceStateUpdated.Unregister(value);
 	}
+
 	private readonly AsyncEvent<DiscordClient, VoiceStateUpdateEventArgs> _voiceStateUpdated;
 
 	/// <summary>
@@ -44,6 +44,7 @@ public event AsyncEventHandler<LavalinkGuildPlayer, LavalinkTrackStartedEventArg
 		add => this.TrackStartedEvent.Register(value);
 		remove => this.TrackStartedEvent.Unregister(value);
 	}
+
 	internal readonly AsyncEvent<LavalinkGuildPlayer, LavalinkTrackStartedEventArgs> TrackStartedEvent;
 
 	/// <summary>
@@ -54,6 +55,7 @@ public event AsyncEventHandler<LavalinkGuildPlayer, LavalinkTrackEndedEventArgs>
 		add => this.TrackEndedEvent.Register(value);
 		remove => this.TrackEndedEvent.Unregister(value);
 	}
+
 	internal readonly AsyncEvent<LavalinkGuildPlayer, LavalinkTrackEndedEventArgs> TrackEndedEvent;
 
 	/// <summary>
@@ -64,6 +66,7 @@ public event AsyncEventHandler<LavalinkGuildPlayer, LavalinkTrackExceptionEventA
 		add => this.TrackExceptionEvent.Register(value);
 		remove => this.TrackExceptionEvent.Unregister(value);
 	}
+
 	internal readonly AsyncEvent<LavalinkGuildPlayer, LavalinkTrackExceptionEventArgs> TrackExceptionEvent;
 
 	/// <summary>
@@ -74,6 +77,7 @@ public event AsyncEventHandler<LavalinkGuildPlayer, LavalinkTrackStuckEventArgs>
 		add => this.TrackStuckEvent.Register(value);
 		remove => this.TrackStuckEvent.Unregister(value);
 	}
+
 	internal readonly AsyncEvent<LavalinkGuildPlayer, LavalinkTrackStuckEventArgs> TrackStuckEvent;
 
 	/// <summary>
@@ -84,6 +88,7 @@ public event AsyncEventHandler<LavalinkGuildPlayer, LavalinkPlayerStateUpdateEve
 		add => this.StateUpdatedEvent.Register(value);
 		remove => this.StateUpdatedEvent.Unregister(value);
 	}
+
 	internal readonly AsyncEvent<LavalinkGuildPlayer, LavalinkPlayerStateUpdateEventArgs> StateUpdatedEvent;
 
 	/// <summary>
@@ -170,6 +175,7 @@ public IReadOnlyList<IQueueEntry> QueueEntries
 	/// </summary>
 	public IReadOnlyList<DiscordUser> CurrentUsers
 		=> new List<DiscordUser>(this.CurrentUsersInternal.Values);
+
 	/// <summary>
 	/// Gets the internal list of users.
 	/// </summary>
@@ -379,6 +385,7 @@ public async Task<LavalinkGuildPlayer> SetVolumeAsync(int volume)
 	{
 		if (volume is < 0 or > 1000)
 			throw new ArgumentException("Volume can only be between 0 and 1000", nameof(volume));
+
 		this.Player = await this.Session.Rest.UpdatePlayerAsync(this.Session.Config.SessionId!, this.GuildId, true, volume: volume).ConfigureAwait(false);
 		return this;
 	}
@@ -425,6 +432,7 @@ public async Task<LavalinkGuildPlayer> PlayDirectUrlAsync(string url)
 		{
 			if (url.Contains("playlist"))
 				throw new NotSupportedException("Lavalink is unable to play a playlist directly.");
+
 			var match = CommonRegEx.AdvancedYoutubeRegex.Match(url);
 			if (match.Groups["list"] != null! && !string.IsNullOrEmpty(match.Groups["list"].Value))
 			{
@@ -443,7 +451,7 @@ public async Task<LavalinkGuildPlayer> PlayDirectUrlAsync(string url)
 		return this;
 	}
 
-	#region Queue Operations
+#region Queue Operations
 
 	/// <summary>
 	/// Adds a <see cref="LavalinkTrack"/> to the queue.
@@ -477,6 +485,7 @@ public async void PlayQueueAsync()
 	{
 		if (!this.QUEUE_SYSTEM_ENABLED)
 			return;
+
 		while (this._queueEntriesInternal.Count > 0)
 		{
 			this._queueTsc = new();
@@ -496,7 +505,7 @@ public async void PlayQueueAsync()
 		}
 	}
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Switches the player to a new channel.
@@ -508,16 +517,14 @@ public async Task SwitchChannelAsync(DiscordChannel channel, bool deafened = tru
 	{
 		if (channel.Type != ChannelType.Stage && channel.Type != ChannelType.Voice)
 			throw new ArgumentException("Cannot switch to a non-voice channel", nameof(channel));
+
 		this.ChannelId = channel.Id;
 		var vsd = new DiscordDispatchPayload
 		{
 			OpCode = 4,
 			Payload = new VoiceStateUpdatePayload()
 			{
-				GuildId = this.GuildId,
-				ChannelId = this.ChannelId,
-				Deafened = deafened,
-				Muted = false
+				GuildId = this.GuildId, ChannelId = this.ChannelId, Deafened = deafened, Muted = false
 			}
 		};
 		await this.Session.Discord.WsSendAsync(LavalinkJson.SerializeObject(vsd)).ConfigureAwait(false);
@@ -537,7 +544,6 @@ internal void UpdatePlayerState(LavalinkPlayerState state)
 	internal void UpdateVoiceState(LavalinkVoiceState voiceState)
 		=> this.Player.VoiceState = voiceState;
 
-
 	/// <summary>
 	/// Disconnect the guild player from the channel.
 	/// </summary>
@@ -561,10 +567,7 @@ internal async Task DisconnectVoiceAsync()
 			OpCode = 4,
 			Payload = new VoiceStateUpdatePayload()
 			{
-				GuildId = this.GuildId,
-				ChannelId = null,
-				Deafened = false,
-				Muted = false
+				GuildId = this.GuildId, ChannelId = null, Deafened = false, Muted = false
 			}
 		};
 		await this.Session.Discord.WsSendAsync(LavalinkJson.SerializeObject(vsd)).ConfigureAwait(false);
diff --git a/DisCatSharp.Lavalink/LavalinkJson.cs b/DisCatSharp.Lavalink/LavalinkJson.cs
index df2091bca9..e96527e31f 100644
--- a/DisCatSharp.Lavalink/LavalinkJson.cs
+++ b/DisCatSharp.Lavalink/LavalinkJson.cs
@@ -1,4 +1,3 @@
-
 using System.Diagnostics;
 
 using DisCatSharp.Entities;
diff --git a/DisCatSharp.Lavalink/LavalinkRestClient.cs b/DisCatSharp.Lavalink/LavalinkRestClient.cs
index 22027c72e4..c3b3a7a697 100644
--- a/DisCatSharp.Lavalink/LavalinkRestClient.cs
+++ b/DisCatSharp.Lavalink/LavalinkRestClient.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -59,16 +58,12 @@ internal LavalinkRestClient(LavalinkConfiguration configuration, DiscordClient c
 
 		var httpHandler = new HttpClientHandler
 		{
-			UseCookies = false,
-			AutomaticDecompression = DecompressionMethods.All,
-			UseProxy = configuration.Proxy != null!,
-			Proxy = configuration.Proxy
+			UseCookies = false, AutomaticDecompression = DecompressionMethods.All, UseProxy = configuration.Proxy != null!, Proxy = configuration.Proxy
 		};
 
 		this.HttpClient = new(httpHandler)
 		{
-			BaseAddress = new($"{configuration.RestEndpoint.ToHttpString()}"),
-			Timeout = configuration.HttpTimeout
+			BaseAddress = new($"{configuration.RestEndpoint.ToHttpString()}"), Timeout = configuration.HttpTimeout
 		};
 
 		this.TRACE_ENABLED = configuration.EnableTrace;
@@ -105,6 +100,7 @@ private static string GetPath(string route, object routeParams)
 	{
 		if (routeParams == null!)
 			return route;
+
 		var routeParamsProperties = routeParams.GetType()
 			.GetTypeInfo()
 			.DeclaredProperties;
@@ -118,13 +114,19 @@ private static string GetPath(string route, object routeParams)
 					? dt.ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture)
 					: val is DateTimeOffset dto
 						? dto.ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture)
-						: val is IFormattable xf ? xf.ToString(null, CultureInfo.InvariantCulture) : val.ToString();
+						: val is IFormattable xf
+							? xf.ToString(null, CultureInfo.InvariantCulture)
+							: val.ToString();
 		}
+
 		return s_routeArgumentRegex.Replace(route, xm => extractedRouteParams[xm.Groups[1].Value]);
 	}
 
 	private Dictionary<string, string> GetDefaultParams()
-		=> new() { ["trace"] = this.TRACE_ENABLED.ToString().ToLower() };
+		=> new()
+		{
+			["trace"] = this.TRACE_ENABLED.ToString().ToLower()
+		};
 
 	/// <summary>
 	/// Executes a rest request.
@@ -144,6 +146,7 @@ private async Task<LavalinkRestResponse> DoRequestAsync(HttpMethod method, strin
 			request.Content = new StringContent(payload);
 			request.Content.Headers.ContentType = new("application/json");
 		}
+
 		request.Method = method;
 		request.RequestUri = new(this.HttpClient.BaseAddress!, path);
 		var response = await this.HttpClient.SendAsync(request, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);
@@ -160,9 +163,7 @@ private async Task<LavalinkRestResponse> DoRequestAsync(HttpMethod method, strin
 
 		var res = new LavalinkRestResponse()
 		{
-			ResponseCode = response.StatusCode,
-			Response = response.StatusCode != HttpStatusCode.NoContent ? await response.Content.ReadAsStringAsync().ConfigureAwait(false) : null,
-			Headers = response.Headers
+			ResponseCode = response.StatusCode, Response = response.StatusCode != HttpStatusCode.NoContent ? await response.Content.ReadAsStringAsync().ConfigureAwait(false) : null, Headers = response.Headers
 		};
 
 		return res;
@@ -176,7 +177,8 @@ internal async Task<LavalinkRestResponse> GetVersionAsync()
 	{
 		var queryDict = this.GetDefaultParams();
 		var route = $"{Endpoints.VERSION}";
-		var path = GetPath(route, new { });
+		var path = GetPath(route, new
+			{ });
 		return await this.DoRequestAsync(HttpMethod.Get, $"{path}{BuildQueryString(queryDict)}").ConfigureAwait(false);
 	}
 
@@ -188,7 +190,8 @@ internal async Task<LavalinkInfo> GetInfoAsync()
 	{
 		var queryDict = this.GetDefaultParams();
 		var route = $"{Endpoints.V4}{Endpoints.INFO}";
-		var path = GetPath(route, new { });
+		var path = GetPath(route, new
+			{ });
 		var res = await this.DoRequestAsync(HttpMethod.Get, $"{path}{BuildQueryString(queryDict)}").ConfigureAwait(false);
 		return LavalinkJson.DeserializeObject<LavalinkInfo>(res.Response!)!;
 	}
@@ -201,7 +204,8 @@ internal async Task<LavalinkStats> GetStatsAsync()
 	{
 		var queryDict = this.GetDefaultParams();
 		var route = $"{Endpoints.V4}{Endpoints.STATS}";
-		var path = GetPath(route, new { });
+		var path = GetPath(route, new
+			{ });
 		var res = await this.DoRequestAsync(HttpMethod.Get, $"{path}{BuildQueryString(queryDict)}").ConfigureAwait(false);
 		return LavalinkJson.DeserializeObject<LavalinkStats>(res.Response!)!;
 	}
@@ -216,7 +220,10 @@ internal async Task<LavalinkSessionConfiguration> UpdateSessionAsync(string sess
 	{
 		var queryDict = this.GetDefaultParams();
 		var route = $"{Endpoints.V4}{Endpoints.SESSIONS}/:session_id";
-		var path = GetPath(route, new { session_id = sessionId });
+		var path = GetPath(route, new
+		{
+			session_id = sessionId
+		});
 		var res = await this.DoRequestAsync(HttpMethod.Patch, $"{path}{BuildQueryString(queryDict)}", payload: LavalinkJson.SerializeObject(config)).ConfigureAwait(false);
 		return LavalinkJson.DeserializeObject<LavalinkSessionConfiguration>(res.Response!)!;
 	}
@@ -230,7 +237,10 @@ internal async Task<IReadOnlyList<LavalinkPlayer>> GetPlayersAsync(string sessio
 	{
 		var queryDict = this.GetDefaultParams();
 		var route = $"{Endpoints.V4}{Endpoints.SESSIONS}/:session_id{Endpoints.PLAYERS}";
-		var path = GetPath(route, new { session_id = sessionId });
+		var path = GetPath(route, new
+		{
+			session_id = sessionId
+		});
 		var res = await this.DoRequestAsync(HttpMethod.Get, $"{path}{BuildQueryString(queryDict)}").ConfigureAwait(false);
 		return LavalinkJson.DeserializeObject<List<LavalinkPlayer>>(res.Response!)!;
 	}
@@ -247,7 +257,10 @@ internal async Task CreatePlayerAsync(string sessionId, ulong guildId, int defau
 		queryDict.Add("noReplace", "false");
 		var pld = new LavalinkRestPlayerCreatePayload(guildId.ToString(), defaultVolume);
 		var route = $"{Endpoints.V4}{Endpoints.SESSIONS}/:session_id{Endpoints.PLAYERS}/:guild_id";
-		var path = GetPath(route, new { session_id = sessionId, guild_id = guildId });
+		var path = GetPath(route, new
+		{
+			session_id = sessionId, guild_id = guildId
+		});
 		await this.DoRequestAsync(HttpMethod.Patch, $"{path}{BuildQueryString(queryDict)}", payload: LavalinkJson.SerializeObject(pld)).ConfigureAwait(false);
 	}
 
@@ -261,7 +274,10 @@ internal async Task<LavalinkPlayer> GetPlayerAsync(string sessionId, ulong guild
 	{
 		var queryDict = this.GetDefaultParams();
 		var route = $"{Endpoints.V4}{Endpoints.SESSIONS}/:session_id{Endpoints.PLAYERS}/:guild_id";
-		var path = GetPath(route, new { session_id = sessionId, guild_id = guildId });
+		var path = GetPath(route, new
+		{
+			session_id = sessionId, guild_id = guildId
+		});
 		var res = await this.DoRequestAsync(HttpMethod.Get, $"{path}{BuildQueryString(queryDict)}").ConfigureAwait(false);
 		return LavalinkJson.DeserializeObject<LavalinkPlayer>(res.Response!)!;
 	}
@@ -280,10 +296,18 @@ internal async Task<LavalinkPlayer> GetPlayerAsync(string sessionId, ulong guild
 	/// <param name="paused">Whether to pause the track.</param>
 	/// <param name="filters">The filters.</param>
 	/// <returns>The updated <see cref="LavalinkPlayer"/> object.</returns>
-	internal async Task<LavalinkPlayer> UpdatePlayerAsync(string sessionId, ulong guildId, bool noReplace = false,
-		Optional<string?> encodedTrack = default, Optional<string> identifier = default,
-		Optional<int> position = default, Optional<int?> endTime = default,
-		Optional<int> volume = default, Optional<bool> paused = default, Optional<LavalinkFilters> filters = default)
+	internal async Task<LavalinkPlayer> UpdatePlayerAsync(
+		string sessionId,
+		ulong guildId,
+		bool noReplace = false,
+		Optional<string?> encodedTrack = default,
+		Optional<string> identifier = default,
+		Optional<int> position = default,
+		Optional<int?> endTime = default,
+		Optional<int> volume = default,
+		Optional<bool> paused = default,
+		Optional<LavalinkFilters> filters = default
+	)
 	{
 		var queryDict = this.GetDefaultParams();
 		queryDict.Add("noReplace", noReplace.ToString().ToLower());
@@ -298,7 +322,10 @@ internal async Task<LavalinkPlayer> UpdatePlayerAsync(string sessionId, ulong gu
 			Filters = filters
 		};
 		var route = $"{Endpoints.V4}{Endpoints.SESSIONS}/:session_id{Endpoints.PLAYERS}/:guild_id";
-		var path = GetPath(route, new { session_id = sessionId, guild_id = guildId });
+		var path = GetPath(route, new
+		{
+			session_id = sessionId, guild_id = guildId
+		});
 		var res = await this.DoRequestAsync(HttpMethod.Patch, $"{path}{BuildQueryString(queryDict)}", payload: LavalinkJson.SerializeObject(pld)).ConfigureAwait(false);
 		return LavalinkJson.DeserializeObject<LavalinkPlayer>(res.Response!)!;
 	}
@@ -317,7 +344,10 @@ internal async Task UpdatePlayerVoiceStateAsync(string sessionId, ulong guildId,
 		var pld = new LavalinkRestVoiceStateUpdatePayload(state, guildId.ToString());
 
 		var route = $"{Endpoints.V4}{Endpoints.SESSIONS}/:session_id{Endpoints.PLAYERS}/:guild_id";
-		var path = GetPath(route, new { session_id = sessionId, guild_id = guildId });
+		var path = GetPath(route, new
+		{
+			session_id = sessionId, guild_id = guildId
+		});
 		await this.DoRequestAsync(HttpMethod.Patch, $"{path}{BuildQueryString(queryDict)}", payload: LavalinkJson.SerializeObject(pld)).ConfigureAwait(false);
 	}
 
@@ -331,7 +361,10 @@ internal async Task DestroyPlayerAsync(string sessionId, ulong guildId)
 	{
 		var queryDict = this.GetDefaultParams();
 		var route = $"{Endpoints.V4}{Endpoints.SESSIONS}/:session_id{Endpoints.PLAYERS}/:guild_id";
-		var path = GetPath(route, new { session_id = sessionId, guild_id = guildId });
+		var path = GetPath(route, new
+		{
+			session_id = sessionId, guild_id = guildId
+		});
 		await this.DoRequestAsync(HttpMethod.Delete, $"{path}{BuildQueryString(queryDict)}").ConfigureAwait(false);
 	}
 
@@ -345,13 +378,13 @@ internal async Task<LavalinkTrackLoadingResult> LoadTracksAsync(string identifie
 		var queryDict = this.GetDefaultParams();
 		queryDict.Add("identifier", identifier);
 		var route = $"{Endpoints.V4}{Endpoints.LOAD_TRACKS}";
-		var path = GetPath(route, new { });
+		var path = GetPath(route, new
+			{ });
 		var res = await this.DoRequestAsync(HttpMethod.Get, $"{path}{BuildQueryString(queryDict)}").ConfigureAwait(false);
 		var obj = JObject.Parse(res.Response!);
-		return new LavalinkTrackLoadingResult()
+		return new()
 		{
-			LoadType = obj.GetValue("loadType")!.ToObject<LavalinkLoadResultType>(),
-			RawResult = LavalinkJson.SerializeObject(obj.GetValue("data"))
+			LoadType = obj.GetValue("loadType")!.ToObject<LavalinkLoadResultType>(), RawResult = LavalinkJson.SerializeObject(obj.GetValue("data"))
 		};
 	}
 
@@ -365,7 +398,8 @@ internal async Task<LavalinkTrack> DecodeTrackAsync(string base64Track)
 		var queryDict = this.GetDefaultParams();
 		queryDict.Add("encodedTrack", base64Track);
 		var route = $"{Endpoints.V4}{Endpoints.DECODE_TRACK}";
-		var path = GetPath(route, new { });
+		var path = GetPath(route, new
+			{ });
 		var res = await this.DoRequestAsync(HttpMethod.Get, $"{path}{BuildQueryString(queryDict)}").ConfigureAwait(false);
 		return LavalinkJson.DeserializeObject<LavalinkTrack>(res.Response!)!;
 	}
@@ -379,7 +413,8 @@ internal async Task<IReadOnlyList<LavalinkTrack>> DecodeTracksAsync(IEnumerable<
 	{
 		var queryDict = this.GetDefaultParams();
 		var route = $"{Endpoints.V4}{Endpoints.DECODE_TRACKS}";
-		var path = GetPath(route, new { });
+		var path = GetPath(route, new
+			{ });
 		var res = await this.DoRequestAsync(HttpMethod.Post, $"{path}{BuildQueryString(queryDict)}", payload: LavalinkJson.SerializeObject(base64Tracks)).ConfigureAwait(false);
 		return LavalinkJson.DeserializeObject<List<LavalinkTrack>>(res.Response!)!;
 	}
diff --git a/DisCatSharp.Lavalink/LavalinkSession.cs b/DisCatSharp.Lavalink/LavalinkSession.cs
index b740bf05ce..5c81f87745 100644
--- a/DisCatSharp.Lavalink/LavalinkSession.cs
+++ b/DisCatSharp.Lavalink/LavalinkSession.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -43,6 +42,7 @@ public event AsyncEventHandler<LavalinkSession, SocketErrorEventArgs> LavalinkSo
 		add => this._lavalinkSocketError.Register(value);
 		remove => this._lavalinkSocketError.Unregister(value);
 	}
+
 	private readonly AsyncEvent<LavalinkSession, SocketErrorEventArgs> _lavalinkSocketError;
 
 	/// <summary>
@@ -53,6 +53,7 @@ internal event AsyncEventHandler<LavalinkSession, LavalinkSessionDisconnectedEve
 		add => this._lavalinkSessionDisconnected.Register(value);
 		remove => this._lavalinkSessionDisconnected.Unregister(value);
 	}
+
 	private readonly AsyncEvent<LavalinkSession, LavalinkSessionDisconnectedEventArgs> _lavalinkSessionDisconnected;
 
 	/// <summary>
@@ -63,6 +64,7 @@ internal event AsyncEventHandler<LavalinkSession, LavalinkSessionConnectedEventA
 		add => this._lavalinkSessionConnected.Register(value);
 		remove => this._lavalinkSessionConnected.Unregister(value);
 	}
+
 	private readonly AsyncEvent<LavalinkSession, LavalinkSessionConnectedEventArgs> _lavalinkSessionConnected;
 
 	/// <summary>
@@ -73,6 +75,7 @@ public event AsyncEventHandler<LavalinkSession, LavalinkStatsReceivedEventArgs>
 		add => this._statsReceived.Register(value);
 		remove => this._statsReceived.Unregister(value);
 	}
+
 	private readonly AsyncEvent<LavalinkSession, LavalinkStatsReceivedEventArgs> _statsReceived;
 
 	/// <summary>
@@ -83,6 +86,7 @@ public event AsyncEventHandler<LavalinkSession, GuildPlayerDestroyedEventArgs> G
 		add => this.GuildPlayerDestroyedEvent.Register(value);
 		remove => this.GuildPlayerDestroyedEvent.Unregister(value);
 	}
+
 	internal readonly AsyncEvent<LavalinkSession, GuildPlayerDestroyedEventArgs> GuildPlayerDestroyedEvent;
 
 	/// <summary>
@@ -93,6 +97,7 @@ public event AsyncEventHandler<LavalinkSession, LavalinkWebsocketClosedEventArgs
 		add => this._websocketClosed.Register(value);
 		remove => this._websocketClosed.Unregister(value);
 	}
+
 	private readonly AsyncEvent<LavalinkSession, LavalinkWebsocketClosedEventArgs> _websocketClosed;
 
 	/// <summary>
@@ -120,6 +125,7 @@ public ConnectionEndpoint NodeEndpoint
 	/// Gets the minimum backoff.
 	/// </summary>
 	private const int MINIMUM_BACKOFF = 7500;
+
 	/// <summary>
 	/// Gets the maximum backoff.
 	/// </summary>
@@ -168,8 +174,7 @@ public IReadOnlyDictionary<ulong, LavalinkGuildPlayer> ConnectedPlayers
 	/// </summary>
 	public LavalinkSessionConfiguration Configuration { get; internal set; } = new()
 	{
-		Resuming = true,
-		TimeoutSeconds = 60
+		Resuming = true, TimeoutSeconds = 60
 	};
 
 	/// <summary>
@@ -303,7 +308,7 @@ public async Task<LavalinkGuildPlayer> ConnectAsync(DiscordChannel channel, bool
 		if (this.ConnectedPlayersInternal.TryGetValue(channel.Guild.Id, out var connectedGuild))
 			return connectedGuild;
 
-		if (channel.Guild == null! || (channel.Type != ChannelType.Voice && channel.Type != ChannelType.Stage))
+		if (channel.Guild == null! || channel.Type != ChannelType.Voice && channel.Type != ChannelType.Stage)
 			throw new ArgumentException("Invalid channel specified.", nameof(channel));
 
 		var vstut = new TaskCompletionSource<VoiceStateUpdateEventArgs>();
@@ -316,10 +321,7 @@ public async Task<LavalinkGuildPlayer> ConnectAsync(DiscordChannel channel, bool
 			OpCode = 4,
 			Payload = new VoiceStateUpdatePayload()
 			{
-				GuildId = channel.Guild.Id,
-				ChannelId = channel.Id,
-				Deafened = deafened,
-				Muted = false
+				GuildId = channel.Guild.Id, ChannelId = channel.Id, Deafened = deafened, Muted = false
 			}
 		};
 		await this.Rest.CreatePlayerAsync(this.Config.SessionId!, channel.Guild.Id, this.Config.DefaultVolume).ConfigureAwait(false);
@@ -328,9 +330,7 @@ public async Task<LavalinkGuildPlayer> ConnectAsync(DiscordChannel channel, bool
 		var vsr = await vsrut.Task.ConfigureAwait(false); // Wait for voice server update to get token, guild_id & endpoint
 		await this.Rest.UpdatePlayerVoiceStateAsync(this.Config.SessionId!, channel.Guild.Id, new()
 		{
-			Endpoint = vsr.Endpoint,
-			Token = vsr.VoiceToken,
-			SessionId = vst.SessionId
+			Endpoint = vsr.Endpoint, Token = vsr.VoiceToken, SessionId = vst.SessionId
 		}).ConfigureAwait(false);
 		var player = await this.Rest.GetPlayerAsync(this.Config.SessionId!, channel.Guild.Id).ConfigureAwait(false);
 
@@ -506,8 +506,7 @@ internal async Task EstablishConnectionAsync()
 
 				this.Discord.Logger.LogCritical(LavalinkEvents.LavalinkConnectionError, ex, "Failed to connect to Lavalink, retrying in {count} ms.", this._backoff);
 			}
-		}
-		while (this.Config.SocketAutoReconnect);
+		} while (this.Config.SocketAutoReconnect);
 
 		Volatile.Write(ref this._isDisposed, false);
 	}
@@ -640,7 +639,10 @@ await player.TrackExceptionEvent.InvokeAsync(player,
 	/// <param name="client">The websocket client.</param>
 	/// <param name="args">The event args.</param>
 	private Task Lavalink_WebSocket_ExceptionThrown(IWebSocketClient client, SocketErrorEventArgs args)
-		=> this._lavalinkSocketError.InvokeAsync(this, new(client.ServiceProvider) { Exception = args.Exception });
+		=> this._lavalinkSocketError.InvokeAsync(this, new(client.ServiceProvider)
+		{
+			Exception = args.Exception
+		});
 
 	/// <summary>
 	/// Handles the event when the websocket disconnected.
@@ -673,12 +675,14 @@ private async Task Lavalink_WebSocket_Disconnected(IWebSocketClient client, Sock
 				_ = Task.Run(async () => await this.GuildPlayerDestroyedEvent.InvokeAsync(this, new(kvp.Value)).ConfigureAwait(false));
 				_ = this.ConnectedPlayersInternal.TryRemove(kvp.Key, out _);
 			}
+
 			this.SessionDisconnected?.Invoke(this);
 			await this._lavalinkSessionDisconnected.InvokeAsync(this, new(this, false)).ConfigureAwait(false);
 
 			if (this.Config.SocketAutoReconnect)
 				await this.EstablishConnectionAsync().ConfigureAwait(false);
 		}
+
 		args.Handled = true;
 	}
 
@@ -728,9 +732,7 @@ private Task Discord_VoiceStateUpdated(DiscordClient client, VoiceStateUpdateEve
 			{
 				var state = new LavalinkVoiceState()
 				{
-					Endpoint = guildPlayer.Player.VoiceState.Endpoint,
-					Token = guildPlayer.Player.VoiceState.Token,
-					SessionId = args.After.SessionId
+					Endpoint = guildPlayer.Player.VoiceState.Endpoint, Token = guildPlayer.Player.VoiceState.Token, SessionId = args.After.SessionId
 				};
 				guildPlayer.UpdateVoiceState(state);
 				await this.Rest.UpdatePlayerVoiceStateAsync(this.Config.SessionId!, guildPlayer.GuildId, state).ConfigureAwait(false);
@@ -759,9 +761,7 @@ private Task Discord_VoiceServerUpdated(DiscordClient client, VoiceServerUpdateE
 			{
 				var state = new LavalinkVoiceState()
 				{
-					Endpoint = args.Endpoint,
-					Token = args.VoiceToken,
-					SessionId = guildPlayer.Player.VoiceState.SessionId
+					Endpoint = args.Endpoint, Token = args.VoiceToken, SessionId = guildPlayer.Player.VoiceState.SessionId
 				};
 				await this.Rest.UpdatePlayerVoiceStateAsync(this.Config.SessionId!, guildPlayer.GuildId, state).ConfigureAwait(false);
 				guildPlayer.UpdateVoiceState(state);
diff --git a/DisCatSharp.Lavalink/Models/LavalinkPlayerUpdateModel.cs b/DisCatSharp.Lavalink/Models/LavalinkPlayerUpdateModel.cs
index 35e2360a64..3acaec6106 100644
--- a/DisCatSharp.Lavalink/Models/LavalinkPlayerUpdateModel.cs
+++ b/DisCatSharp.Lavalink/Models/LavalinkPlayerUpdateModel.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 using DisCatSharp.Lavalink.Entities;
 using DisCatSharp.Lavalink.Entities.Filters;
diff --git a/DisCatSharp.Lavalink/Payloads/DiscordDispatchPayload.cs b/DisCatSharp.Lavalink/Payloads/DiscordDispatchPayload.cs
index 89e78e3eb6..c769a00391 100644
--- a/DisCatSharp.Lavalink/Payloads/DiscordDispatchPayload.cs
+++ b/DisCatSharp.Lavalink/Payloads/DiscordDispatchPayload.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Payloads;
diff --git a/DisCatSharp.Lavalink/Payloads/LavalinkRestPlayerCreatePayload.cs b/DisCatSharp.Lavalink/Payloads/LavalinkRestPlayerCreatePayload.cs
index 506bc60785..09a179f548 100644
--- a/DisCatSharp.Lavalink/Payloads/LavalinkRestPlayerCreatePayload.cs
+++ b/DisCatSharp.Lavalink/Payloads/LavalinkRestPlayerCreatePayload.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Payloads;
diff --git a/DisCatSharp.Lavalink/Payloads/LavalinkRestPlayerUpdatePayload.cs b/DisCatSharp.Lavalink/Payloads/LavalinkRestPlayerUpdatePayload.cs
index f43630d01f..69243dd93a 100644
--- a/DisCatSharp.Lavalink/Payloads/LavalinkRestPlayerUpdatePayload.cs
+++ b/DisCatSharp.Lavalink/Payloads/LavalinkRestPlayerUpdatePayload.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Entities;
 using DisCatSharp.Lavalink.Entities.Filters;
 
diff --git a/DisCatSharp.Lavalink/Payloads/LavalinkRestVoiceStateUpdatePayload.cs b/DisCatSharp.Lavalink/Payloads/LavalinkRestVoiceStateUpdatePayload.cs
index 75c0386020..d511748318 100644
--- a/DisCatSharp.Lavalink/Payloads/LavalinkRestVoiceStateUpdatePayload.cs
+++ b/DisCatSharp.Lavalink/Payloads/LavalinkRestVoiceStateUpdatePayload.cs
@@ -1,4 +1,3 @@
-
 using DisCatSharp.Lavalink.Entities;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp.Lavalink/Payloads/VoiceStateUpdatePayload.cs b/DisCatSharp.Lavalink/Payloads/VoiceStateUpdatePayload.cs
index 76ba9a16de..1d4b899ce0 100644
--- a/DisCatSharp.Lavalink/Payloads/VoiceStateUpdatePayload.cs
+++ b/DisCatSharp.Lavalink/Payloads/VoiceStateUpdatePayload.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Lavalink.Payloads;
diff --git a/DisCatSharp.Targets/DisCatSharp.targets b/DisCatSharp.Targets/DisCatSharp.targets
index ed1db36622..17d3ae9b82 100644
--- a/DisCatSharp.Targets/DisCatSharp.targets
+++ b/DisCatSharp.Targets/DisCatSharp.targets
@@ -1,33 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Authors>AITSYS, DisCatSharp, DisCatSharp Contributors</Authors>
-    <Company>AITSYS</Company>
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <PackageProjectUrl>https://docs.dcs.aitsys.dev</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/Aiko-IT-Systems/DisCatSharp</RepositoryUrl>
-    <RepositoryType>Git</RepositoryType>
-    <PackageIcon>logobig.png</PackageIcon>
-    <PackageLicenseExpression />
-    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
-	<RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
-  </PropertyGroup>
+	<PropertyGroup>
+		<Authors>AITSYS, DisCatSharp, DisCatSharp Contributors</Authors>
+		<Company>AITSYS</Company>
+		<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+		<PackageProjectUrl>https://docs.dcs.aitsys.dev</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/Aiko-IT-Systems/DisCatSharp</RepositoryUrl>
+		<RepositoryType>Git</RepositoryType>
+		<PackageIcon>logobig.png</PackageIcon>
+		<PackageLicenseExpression />
+		<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+		<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+		<RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <None Include="..\LICENSE.md">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-	  <None Include="..\RELEASENOTES.md">
-		  <Pack>True</Pack>
-		  <PackagePath></PackagePath>
-	  </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\DisCatSharp.Logos\logobig.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<None Include="..\LICENSE.md">
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
+		</None>
+		<None Include="..\RELEASENOTES.md">
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
+		</None>
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\DisCatSharp.Logos\logobig.png">
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
+		</None>
+	</ItemGroup>
 </Project>
diff --git a/DisCatSharp.Targets/InternalsVisibleTo.targets b/DisCatSharp.Targets/InternalsVisibleTo.targets
index 98a726adc3..b1748c115d 100644
--- a/DisCatSharp.Targets/InternalsVisibleTo.targets
+++ b/DisCatSharp.Targets/InternalsVisibleTo.targets
@@ -1,37 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-	<InternalsVisibleTo Include="DisCatSharp" />
-	<InternalsVisibleTo Include="DisCatSharp.ApplicationCommands" />
-	<InternalsVisibleTo Include="DisCatSharp.CommandsNext" />
-	<InternalsVisibleTo Include="DisCatSharp.Common" />
-	<InternalsVisibleTo Include="DisCatSharp.Configuration" />
-	<InternalsVisibleTo Include="DisCatSharp.Configuration.Tests" />
-	<InternalsVisibleTo Include="DisCatSharp.EventHandlers.Tests" />
-	<InternalsVisibleTo Include="DisCatSharp.Hosting" />
-	<InternalsVisibleTo Include="DisCatSharp.Hosting.DependencyInjection" />
-	<InternalsVisibleTo Include="DisCatSharp.Hosting.Tests" />
-	<InternalsVisibleTo Include="DisCatSharp.Interactivity" />
-	<InternalsVisibleTo Include="DisCatSharp.Lavalink" />
-	<InternalsVisibleTo Include="DisCatSharp.LavalinkV1" />
-	<InternalsVisibleTo Include="DisCatSharp.Phabricator" />
-	<InternalsVisibleTo Include="DisCatSharp.Support" />
-	<InternalsVisibleTo Include="DisCatSharp.Tests" />
-	<InternalsVisibleTo Include="DisCatSharp.SafetyTests.Internal" />
-	<InternalsVisibleTo Include="DisCatSharp.VoiceNext" />
-	<InternalsVisibleTo Include="DisCatSharp.VoiceNext.Natives" />
-	<InternalsVisibleTo Include="DisCatSharp.DevTools" />
-	<InternalsVisibleTo Include="DisCatSharp.DocsGenerator" />
-	<InternalsVisibleTo Include="DisCatSharp.StaffApps" />
-	<InternalsVisibleTo Include="DisCatSharp.Experimental" />
-	<InternalsVisibleTo Include="DisCatSharp.Extensions.OAuth2Web" />
-	<InternalsVisibleTo Include="DisCatSharp.Extensions.TwoFactorCommands" />
-	<InternalsVisibleTo Include="Nyaw" />
-	<InternalsVisibleTo Include="MikuSharp" />
-	<InternalsVisibleTo Include="Microsoft.DocAsCode" />
-	<InternalsVisibleTo Include="Microsoft.DocAsCode.Metadata.ManagedReference" />
-	<InternalsVisibleTo Include="ProjectMakoto" />
-	<InternalsVisibleTo Include="SidePlus_AuthBot" />
-	<InternalsVisibleTo Include="SidePlus_Helper" />
-  </ItemGroup>
+	<ItemGroup>
+		<InternalsVisibleTo Include="DisCatSharp" />
+		<InternalsVisibleTo Include="DisCatSharp.ApplicationCommands" />
+		<InternalsVisibleTo Include="DisCatSharp.CommandsNext" />
+		<InternalsVisibleTo Include="DisCatSharp.Common" />
+		<InternalsVisibleTo Include="DisCatSharp.Configuration" />
+		<InternalsVisibleTo Include="DisCatSharp.Configuration.Tests" />
+		<InternalsVisibleTo Include="DisCatSharp.EventHandlers.Tests" />
+		<InternalsVisibleTo Include="DisCatSharp.Hosting" />
+		<InternalsVisibleTo Include="DisCatSharp.Hosting.DependencyInjection" />
+		<InternalsVisibleTo Include="DisCatSharp.Hosting.Tests" />
+		<InternalsVisibleTo Include="DisCatSharp.Interactivity" />
+		<InternalsVisibleTo Include="DisCatSharp.Lavalink" />
+		<InternalsVisibleTo Include="DisCatSharp.LavalinkV1" />
+		<InternalsVisibleTo Include="DisCatSharp.Phabricator" />
+		<InternalsVisibleTo Include="DisCatSharp.Support" />
+		<InternalsVisibleTo Include="DisCatSharp.Tests" />
+		<InternalsVisibleTo Include="DisCatSharp.SafetyTests.Internal" />
+		<InternalsVisibleTo Include="DisCatSharp.VoiceNext" />
+		<InternalsVisibleTo Include="DisCatSharp.VoiceNext.Natives" />
+		<InternalsVisibleTo Include="DisCatSharp.DevTools" />
+		<InternalsVisibleTo Include="DisCatSharp.DocsGenerator" />
+		<InternalsVisibleTo Include="DisCatSharp.StaffApps" />
+		<InternalsVisibleTo Include="DisCatSharp.Experimental" />
+		<InternalsVisibleTo Include="DisCatSharp.Extensions.OAuth2Web" />
+		<InternalsVisibleTo Include="DisCatSharp.Extensions.TwoFactorCommands" />
+		<InternalsVisibleTo Include="DisCatSharp.TranslationGenerator" />
+		<InternalsVisibleTo Include="Nyaw" />
+		<InternalsVisibleTo Include="MikuSharp" />
+		<InternalsVisibleTo Include="Microsoft.DocAsCode" />
+		<InternalsVisibleTo Include="Microsoft.DocAsCode.Metadata.ManagedReference" />
+		<InternalsVisibleTo Include="ProjectMakoto" />
+		<InternalsVisibleTo Include="SidePlus_AuthBot" />
+		<InternalsVisibleTo Include="SidePlus_Helper" />
+	</ItemGroup>
 </Project>
diff --git a/DisCatSharp.Targets/Library.targets b/DisCatSharp.Targets/Library.targets
index b2914f8fdf..195be394e1 100644
--- a/DisCatSharp.Targets/Library.targets
+++ b/DisCatSharp.Targets/Library.targets
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-	<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	<Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Library</OutputType>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
 </Project>
diff --git a/DisCatSharp.Targets/NuGet.targets b/DisCatSharp.Targets/NuGet.targets
index 737d91d103..4134e7347c 100644
--- a/DisCatSharp.Targets/NuGet.targets
+++ b/DisCatSharp.Targets/NuGet.targets
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<IncludeSymbols>true</IncludeSymbols>
@@ -11,26 +12,27 @@
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
 		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    	<DefineConstants>$(DefineConstants);CI_BUILD</DefineConstants>
-    	<Deterministic>true</Deterministic>
+		<DefineConstants>$(DefineConstants);CI_BUILD</DefineConstants>
+		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(CI)' == 'True'">
 		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    	<DefineConstants>$(DefineConstants);CI_BUILD</DefineConstants>
-    	<Deterministic>true</Deterministic>
+		<DefineConstants>$(DefineConstants);CI_BUILD</DefineConstants>
+		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
 		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    	<DefineConstants>$(DefineConstants);CI_BUILD</DefineConstants>
-    	<Deterministic>true</Deterministic>
+		<DefineConstants>$(DefineConstants);CI_BUILD</DefineConstants>
+		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(GITHUB_ACTIONS)' != 'true' And '$(TF_BUILD)' != 'true' And '$(CI)' != 'True'">
 		<ContinuousIntegrationBuild>false</ContinuousIntegrationBuild>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>
-	<PropertyGroup Condition="'$(Configuration)' == 'Release' And '$(GITHUB_ACTIONS)' == 'true' And '$(SENTRY_AUTH_TOKEN)' != ''">
+	<PropertyGroup
+		Condition="'$(Configuration)' == 'Release' And '$(GITHUB_ACTIONS)' == 'true' And '$(SENTRY_AUTH_TOKEN)' != ''">
 		<SentryOrg>aitsys</SentryOrg>
 		<SentryProject>discatsharp</SentryProject>
 		<SentryUploadSymbols>true</SentryUploadSymbols>
diff --git a/DisCatSharp.Targets/Package.targets b/DisCatSharp.Targets/Package.targets
index daffb9ed87..e7ce5a0fd8 100644
--- a/DisCatSharp.Targets/Package.targets
+++ b/DisCatSharp.Targets/Package.targets
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NoWarn>1591;NU5128;DV2001</NoWarn>
-    <LangVersion>latest</LangVersion>
-    <Optimize>True</Optimize>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <Optimize>False</Optimize>
-  </PropertyGroup>
+	<PropertyGroup>
+		<NoWarn>1591;NU5128;DV2001</NoWarn>
+		<LangVersion>latest</LangVersion>
+		<Optimize>True</Optimize>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+		<Optimize>False</Optimize>
+	</PropertyGroup>
 </Project>
diff --git a/DisCatSharp.Targets/Version.targets b/DisCatSharp.Targets/Version.targets
index dbf6a376f4..de60198d8a 100644
--- a/DisCatSharp.Targets/Version.targets
+++ b/DisCatSharp.Targets/Version.targets
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VersionPrefix>10.4.2</VersionPrefix>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">
-    <Version>$(VersionPrefix)-$(VersionSuffix)-$(BuildNumber)</Version>
-    <AssemblyVersion>$(VersionPrefix).$(BuildNumber)</AssemblyVersion>
-    <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">
-    <Version>$(VersionPrefix)-$(VersionSuffix)</Version>
-    <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
-    <FileVersion>$(VersionPrefix).0</FileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(VersionSuffix)' == ''">
-    <Version>$(VersionPrefix)</Version>
-    <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
-    <FileVersion>$(VersionPrefix).0</FileVersion>
-  </PropertyGroup>
+	<PropertyGroup>
+		<VersionPrefix>10.4.2</VersionPrefix>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">
+		<Version>$(VersionPrefix)-$(VersionSuffix)-$(BuildNumber)</Version>
+		<AssemblyVersion>$(VersionPrefix).$(BuildNumber)</AssemblyVersion>
+		<FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">
+		<Version>$(VersionPrefix)-$(VersionSuffix)</Version>
+		<AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
+		<FileVersion>$(VersionPrefix).0</FileVersion>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(VersionSuffix)' == ''">
+		<Version>$(VersionPrefix)</Version>
+		<AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
+		<FileVersion>$(VersionPrefix).0</FileVersion>
+	</PropertyGroup>
 </Project>
diff --git a/DisCatSharp.Tests/SafetyTests/HttpTest.cs b/DisCatSharp.Tests/SafetyTests/HttpTest.cs
index 2eaf037319..e7c2ee3ce8 100644
--- a/DisCatSharp.Tests/SafetyTests/HttpTest.cs
+++ b/DisCatSharp.Tests/SafetyTests/HttpTest.cs
@@ -1,4 +1,3 @@
-
 using System;
 
 using FluentAssertions;
@@ -12,7 +11,10 @@ public class HttpTests
 	[Fact(DisplayName = "Ensure that no authorization header is set by DiscordClient")]
 	public void BuiltInRestClientEnsureNoAuthorization()
 	{
-		DiscordClient client = new(new() { Token = "super_secret_bot_token" });
+		DiscordClient client = new(new()
+		{
+			Token = "super_secret_bot_token"
+		});
 		var action = () => client.RestClient.DefaultRequestHeaders.GetValues("Authorization").ToString();
 		action.Should()
 			.Throw<InvalidOperationException>()
diff --git a/DisCatSharp.VoiceNext.Natives/DisCatSharp.VoiceNext.Natives.csproj b/DisCatSharp.VoiceNext.Natives/DisCatSharp.VoiceNext.Natives.csproj
index 77a7d92b87..0cdab6d400 100644
--- a/DisCatSharp.VoiceNext.Natives/DisCatSharp.VoiceNext.Natives.csproj
+++ b/DisCatSharp.VoiceNext.Natives/DisCatSharp.VoiceNext.Natives.csproj
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../DisCatSharp.Targets/Version.targets" />
-  <Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
-  <Import Project="../DisCatSharp.Targets/Package.targets" />
-  <Import Project="../DisCatSharp.Targets/Library.targets" />
-  <Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
-
-  <PropertyGroup>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <IncludeSymbols>false</IncludeSymbols>
-    <SymbolPackageFormat>symbols.nupkg</SymbolPackageFormat>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <PackageId>DisCatSharp.VoiceNext.Natives</PackageId>
-	<Description>
-Natives for DisCatSharp Voice Next Extension
-
-Manual Download: https://docs.dcs.aitsys.dev/natives/index.html
-	</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Voice,Audio Player</PackageTags>
-	<Nullable>annotations</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="runtimes/**/*.*">
-      <Pack>true</Pack>
-      <PackagePath>runtimes</PackagePath>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="System.Reflection" Version="4.3.0" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-  </ItemGroup>
+	<Import Project="../DisCatSharp.Targets/Version.targets" />
+	<Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
+	<Import Project="../DisCatSharp.Targets/Package.targets" />
+	<Import Project="../DisCatSharp.Targets/Library.targets" />
+	<Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
+
+	<PropertyGroup>
+		<IncludeBuildOutput>false</IncludeBuildOutput>
+		<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+		<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+		<IncludeSymbols>false</IncludeSymbols>
+		<SymbolPackageFormat>symbols.nupkg</SymbolPackageFormat>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<PackageId>DisCatSharp.VoiceNext.Natives</PackageId>
+		<Description>
+			Natives for DisCatSharp Voice Next Extension
+
+			Manual Download: https://docs.dcs.aitsys.dev/natives/index.html
+		</Description>
+		<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Voice,Audio Player</PackageTags>
+		<Nullable>annotations</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Content Include="runtimes/**/*.*">
+			<Pack>true</Pack>
+			<PackagePath>runtimes</PackagePath>
+		</Content>
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+		<PackageReference Include="System.Reflection" Version="4.3.0" />
+		<PackageReference Include="System.Runtime" Version="4.3.1" />
+	</ItemGroup>
 
 </Project>
diff --git a/DisCatSharp.VoiceNext/AudioFormat.cs b/DisCatSharp.VoiceNext/AudioFormat.cs
index 2377504e3d..d0384d4d84 100644
--- a/DisCatSharp.VoiceNext/AudioFormat.cs
+++ b/DisCatSharp.VoiceNext/AudioFormat.cs
@@ -14,17 +14,26 @@ public readonly struct AudioFormat
 	/// <summary>
 	/// Gets the collection of sampling rates (in Hz) the Opus encoder can use.
 	/// </summary>
-	public static IReadOnlyCollection<int> AllowedSampleRates { get; } = new ReadOnlyCollection<int>(new[] { 8000, 12000, 16000, 24000, 48000 });
+	public static IReadOnlyCollection<int> AllowedSampleRates { get; } = new ReadOnlyCollection<int>(new[]
+	{
+		8000, 12000, 16000, 24000, 48000
+	});
 
 	/// <summary>
 	/// Gets the collection of channel counts the Opus encoder can use.
 	/// </summary>
-	public static IReadOnlyCollection<int> AllowedChannelCounts { get; } = new ReadOnlyCollection<int>(new[] { 1, 2 });
+	public static IReadOnlyCollection<int> AllowedChannelCounts { get; } = new ReadOnlyCollection<int>(new[]
+	{
+		1, 2
+	});
 
 	/// <summary>
 	/// Gets the collection of sample durations (in ms) the Opus encoder can use.
 	/// </summary>
-	public static IReadOnlyCollection<int> AllowedSampleDurations { get; } = new ReadOnlyCollection<int>(new[] { 5, 10, 20, 40, 60 });
+	public static IReadOnlyCollection<int> AllowedSampleDurations { get; } = new ReadOnlyCollection<int>(new[]
+	{
+		5, 10, 20, 40, 60
+	});
 
 	/// <summary>
 	/// Gets the default audio format. This is a format configured for 48kHz sampling rate, 2 channels, with music quality preset.
@@ -137,5 +146,5 @@ internal int SampleCountToSampleSize(int sampleCount)
 	/// <returns>A bool.</returns>
 	internal bool IsValid()
 		=> AllowedSampleRates.Contains(this.SampleRate) && AllowedChannelCounts.Contains(this.ChannelCount) &&
-			(this.VoiceApplication == VoiceApplication.Music || this.VoiceApplication == VoiceApplication.Voice || this.VoiceApplication == VoiceApplication.LowLatency);
+		   (this.VoiceApplication == VoiceApplication.Music || this.VoiceApplication == VoiceApplication.Voice || this.VoiceApplication == VoiceApplication.LowLatency);
 }
diff --git a/DisCatSharp.VoiceNext/Codec/Interop.cs b/DisCatSharp.VoiceNext/Codec/Interop.cs
index a577ed9e40..350fa57272 100644
--- a/DisCatSharp.VoiceNext/Codec/Interop.cs
+++ b/DisCatSharp.VoiceNext/Codec/Interop.cs
@@ -8,7 +8,8 @@ namespace DisCatSharp.VoiceNext.Codec;
 /// </summary>
 internal static class Interop
 {
-	#region Sodium wrapper
+#region Sodium wrapper
+
 	/// <summary>
 	/// The sodium library name.
 	/// </summary>
@@ -63,7 +64,7 @@ internal static class Interop
 	/// <param name="key">The key.</param>
 	/// <returns>An int.</returns>
 	[DllImport(SODIUM_LIBRARY_NAME, CallingConvention = CallingConvention.Cdecl, EntryPoint = "crypto_secretbox_easy")]
-	private static unsafe extern int _SodiumSecretBoxCreate(byte* buffer, byte* message, ulong messageLength, byte* nonce, byte* key);
+	private static extern unsafe int _SodiumSecretBoxCreate(byte* buffer, byte* message, ulong messageLength, byte* nonce, byte* key);
 
 	/// <summary>
 	/// _S the sodium secret box open.
@@ -75,7 +76,7 @@ internal static class Interop
 	/// <param name="key">The key.</param>
 	/// <returns>An int.</returns>
 	[DllImport(SODIUM_LIBRARY_NAME, CallingConvention = CallingConvention.Cdecl, EntryPoint = "crypto_secretbox_open_easy")]
-	private static unsafe extern int _SodiumSecretBoxOpen(byte* buffer, byte* encryptedMessage, ulong encryptedLength, byte* nonce, byte* key);
+	private static extern unsafe int _SodiumSecretBoxOpen(byte* buffer, byte* encryptedMessage, ulong encryptedLength, byte* nonce, byte* key);
 
 	/// <summary>
 	/// Encrypts supplied buffer using xsalsa20_poly1305 algorithm, using supplied key and nonce to perform encryption.
@@ -116,9 +117,11 @@ public static unsafe int Decrypt(ReadOnlySpan<byte> source, Span<byte> target, R
 
 		return status;
 	}
-	#endregion
 
-	#region Opus wrapper
+#endregion
+
+#region Opus wrapper
+
 	/// <summary>
 	/// The opus library name.
 	/// </summary>
@@ -152,7 +155,7 @@ public static unsafe int Decrypt(ReadOnlySpan<byte> source, Span<byte> target, R
 	/// <param name="maxDataBytes">The max data bytes.</param>
 	/// <returns>An int.</returns>
 	[DllImport(OPUS_LIBRARY_NAME, CallingConvention = CallingConvention.Cdecl, EntryPoint = "opus_encode")]
-	private static unsafe extern int _OpusEncode(IntPtr encoder, byte* pcmData, int frameSize, byte* data, int maxDataBytes);
+	private static extern unsafe int _OpusEncode(IntPtr encoder, byte* pcmData, int frameSize, byte* data, int maxDataBytes);
 
 	/// <summary>
 	/// _S the opus encoder control.
@@ -192,7 +195,7 @@ public static unsafe int Decrypt(ReadOnlySpan<byte> source, Span<byte> target, R
 	/// <param name="decodeFec">The decode fec.</param>
 	/// <returns>An int.</returns>
 	[DllImport(OPUS_LIBRARY_NAME, CallingConvention = CallingConvention.Cdecl, EntryPoint = "opus_decode")]
-	private static unsafe extern int _OpusDecode(IntPtr decoder, byte* opusData, int opusDataLength, byte* data, int frameSize, int decodeFec);
+	private static extern unsafe int _OpusDecode(IntPtr decoder, byte* opusData, int opusDataLength, byte* data, int frameSize, int decodeFec);
 
 	/// <summary>
 	/// _S the opus get packet channel count.
@@ -200,7 +203,7 @@ public static unsafe int Decrypt(ReadOnlySpan<byte> source, Span<byte> target, R
 	/// <param name="opusData">The opus data.</param>
 	/// <returns>An int.</returns>
 	[DllImport(OPUS_LIBRARY_NAME, CallingConvention = CallingConvention.Cdecl, EntryPoint = "opus_packet_get_nb_channels")]
-	private static unsafe extern int _OpusGetPacketChannelCount(byte* opusData);
+	private static extern unsafe int _OpusGetPacketChannelCount(byte* opusData);
 
 	/// <summary>
 	/// _S the opus get packet frame count.
@@ -209,7 +212,7 @@ public static unsafe int Decrypt(ReadOnlySpan<byte> source, Span<byte> target, R
 	/// <param name="length">The length.</param>
 	/// <returns>An int.</returns>
 	[DllImport(OPUS_LIBRARY_NAME, CallingConvention = CallingConvention.Cdecl, EntryPoint = "opus_packet_get_nb_frames")]
-	private static unsafe extern int _OpusGetPacketFrameCount(byte* opusData, int length);
+	private static extern unsafe int _OpusGetPacketFrameCount(byte* opusData, int length);
 
 	/// <summary>
 	/// _S the opus get packet sample per frame count.
@@ -218,7 +221,7 @@ public static unsafe int Decrypt(ReadOnlySpan<byte> source, Span<byte> target, R
 	/// <param name="samplingRate">The sampling rate.</param>
 	/// <returns>An int.</returns>
 	[DllImport(OPUS_LIBRARY_NAME, CallingConvention = CallingConvention.Cdecl, EntryPoint = "opus_packet_get_samples_per_frame")]
-	private static unsafe extern int _OpusGetPacketSamplePerFrameCount(byte* opusData, int samplingRate);
+	private static extern unsafe int _OpusGetPacketSamplePerFrameCount(byte* opusData, int samplingRate);
 
 	/// <summary>
 	/// _S the opus decoder control.
@@ -238,7 +241,7 @@ public static unsafe int Decrypt(ReadOnlySpan<byte> source, Span<byte> target, R
 	public static IntPtr OpusCreateEncoder(AudioFormat audioFormat)
 	{
 		var encoder = _OpusCreateEncoder(audioFormat.SampleRate, audioFormat.ChannelCount, (int)audioFormat.VoiceApplication, out var error);
-		return error != OpusError.Ok ? throw new Exception($"Could not instantiate Opus encoder: {error} ({(int)error}).") : encoder;
+		return error != OpusError.Ok ? throw new($"Could not instantiate Opus encoder: {error} ({(int)error}).") : encoder;
 	}
 
 	/// <summary>
@@ -251,7 +254,7 @@ public static void OpusSetEncoderOption(IntPtr encoder, OpusControl option, int
 	{
 		var error = OpusError.Ok;
 		if ((error = _OpusEncoderControl(encoder, option, value)) != OpusError.Ok)
-			throw new Exception($"Could not set Opus encoder option: {error} ({(int)error}).");
+			throw new($"Could not set Opus encoder option: {error} ({(int)error}).");
 	}
 
 	/// <summary>
@@ -272,7 +275,7 @@ public static unsafe void OpusEncode(IntPtr encoder, ReadOnlySpan<byte> pcm, int
 		if (len < 0)
 		{
 			var error = (OpusError)len;
-			throw new Exception($"Could not encode PCM data to Opus: {error} ({(int)error}).");
+			throw new($"Could not encode PCM data to Opus: {error} ({(int)error}).");
 		}
 
 		opus = opus[..len];
@@ -286,7 +289,7 @@ public static unsafe void OpusEncode(IntPtr encoder, ReadOnlySpan<byte> pcm, int
 	public static IntPtr OpusCreateDecoder(AudioFormat audioFormat)
 	{
 		var decoder = _OpusCreateDecoder(audioFormat.SampleRate, audioFormat.ChannelCount, out var error);
-		return error != OpusError.Ok ? throw new Exception($"Could not instantiate Opus decoder: {error} ({(int)error}).") : decoder;
+		return error != OpusError.Ok ? throw new($"Could not instantiate Opus decoder: {error} ({(int)error}).") : decoder;
 	}
 
 	/// <summary>
@@ -309,7 +312,7 @@ public static unsafe int OpusDecode(IntPtr decoder, ReadOnlySpan<byte> opus, int
 		if (len < 0)
 		{
 			var error = (OpusError)len;
-			throw new Exception($"Could not decode PCM data from Opus: {error} ({(int)error}).");
+			throw new($"Could not decode PCM data from Opus: {error} ({(int)error}).");
 		}
 
 		return len;
@@ -332,7 +335,7 @@ public static unsafe int OpusDecode(IntPtr decoder, int frameSize, Span<byte> pc
 		if (len < 0)
 		{
 			var error = (OpusError)len;
-			throw new Exception($"Could not decode PCM data from Opus: {error} ({(int)error}).");
+			throw new($"Could not decode PCM data from Opus: {error} ({(int)error}).");
 		}
 
 		return len;
@@ -366,5 +369,6 @@ public static unsafe void OpusGetPacketMetrics(ReadOnlySpan<byte> opus, int samp
 	/// <param name="sampleCount">The sample count.</param>
 	public static void OpusGetLastPacketDuration(IntPtr decoder, out int sampleCount)
 		=> _OpusDecoderControl(decoder, OpusControl.GetLastPacketDuration, out sampleCount);
-	#endregion
+
+#endregion
 }
diff --git a/DisCatSharp.VoiceNext/Codec/Opus.cs b/DisCatSharp.VoiceNext/Codec/Opus.cs
index 72b48d51b4..95f387d427 100644
--- a/DisCatSharp.VoiceNext/Codec/Opus.cs
+++ b/DisCatSharp.VoiceNext/Codec/Opus.cs
@@ -47,12 +47,13 @@ public Opus(AudioFormat audioFormat)
 				sig = OpusSignal.Voice;
 				break;
 		}
+
 		Interop.OpusSetEncoderOption(this._encoder, OpusControl.SetSignal, (int)sig);
 		Interop.OpusSetEncoderOption(this._encoder, OpusControl.SetPacketLossPercent, 15);
 		Interop.OpusSetEncoderOption(this._encoder, OpusControl.SetInBandFec, 1);
 		Interop.OpusSetEncoderOption(this._encoder, OpusControl.SetBitrate, 131072);
 
-		this._managedDecoders = new List<OpusDecoder>();
+		this._managedDecoders = new();
 	}
 
 	/// <summary>
@@ -89,7 +90,7 @@ public void Decode(OpusDecoder decoder, ReadOnlySpan<byte> opus, ref Span<byte>
 		//    throw new ArgumentException("PCM target buffer size needs to be equal to maximum buffer size for specified audio format.", nameof(target));
 
 		Interop.OpusGetPacketMetrics(opus, this.AudioFormat.SampleRate, out var channels, out var frames, out var samplesPerFrame, out var frameSize);
-		outputFormat = this.AudioFormat.ChannelCount != channels ? new AudioFormat(this.AudioFormat.SampleRate, channels, this.AudioFormat.VoiceApplication) : this.AudioFormat;
+		outputFormat = this.AudioFormat.ChannelCount != channels ? new(this.AudioFormat.SampleRate, channels, this.AudioFormat.VoiceApplication) : this.AudioFormat;
 
 		if (decoder.AudioFormat.ChannelCount != channels)
 			decoder.Initialize(outputFormat);
@@ -157,10 +158,8 @@ public void Dispose()
 		Interop.OpusDestroyEncoder(this._encoder);
 
 		lock (this._managedDecoders)
-		{
 			foreach (var decoder in this._managedDecoders)
 				decoder.Dispose();
-		}
 	}
 }
 
@@ -178,6 +177,7 @@ public class OpusDecoder : IDisposable
 	/// Gets the opus.
 	/// </summary>
 	internal Opus Opus { get; }
+
 	/// <summary>
 	/// Gets the decoder.
 	/// </summary>
@@ -262,5 +262,5 @@ internal enum OpusSignal : int
 {
 	Auto = -1000,
 	Voice = 3001,
-	Music = 3002,
+	Music = 3002
 }
diff --git a/DisCatSharp.VoiceNext/Codec/Rtp.cs b/DisCatSharp.VoiceNext/Codec/Rtp.cs
index 0fda40f204..5f5d9667c9 100644
--- a/DisCatSharp.VoiceNext/Codec/Rtp.cs
+++ b/DisCatSharp.VoiceNext/Codec/Rtp.cs
@@ -17,10 +17,12 @@ internal sealed class Rtp : IDisposable
 	/// The rtp no extension.
 	/// </summary>
 	private const byte RTP_NO_EXTENSION = 0x80;
+
 	/// <summary>
 	/// The rtp extension.
 	/// </summary>
 	private const byte RTP_EXTENSION = 0x90;
+
 	/// <summary>
 	/// The rtp version.
 	/// </summary>
@@ -48,9 +50,9 @@ public void EncodeHeader(ushort sequence, uint timestamp, uint ssrc, Span<byte>
 		target[1] = RTP_VERSION;
 
 		// Write data big endian
-		BinaryPrimitives.WriteUInt16BigEndian(target[2..], sequence);  // header + magic
+		BinaryPrimitives.WriteUInt16BigEndian(target[2..], sequence); // header + magic
 		BinaryPrimitives.WriteUInt32BigEndian(target[4..], timestamp); // header + magic + sizeof(sequence)
-		BinaryPrimitives.WriteUInt32BigEndian(target[8..], ssrc);      // header + magic + sizeof(sequence) + sizeof(timestamp)
+		BinaryPrimitives.WriteUInt32BigEndian(target[8..], ssrc); // header + magic + sizeof(sequence) + sizeof(timestamp)
 	}
 
 	/// <summary>
@@ -73,7 +75,7 @@ public void DecodeHeader(ReadOnlySpan<byte> source, out ushort sequence, out uin
 		if (source.Length < HEADER_SIZE)
 			throw new ArgumentException("Header buffer is too short.", nameof(source));
 
-		if ((source[0] != RTP_NO_EXTENSION && source[0] != RTP_EXTENSION) || source[1] != RTP_VERSION)
+		if (source[0] != RTP_NO_EXTENSION && source[0] != RTP_EXTENSION || source[1] != RTP_VERSION)
 			throw new ArgumentException("Invalid RTP header.", nameof(source));
 
 		hasExtension = source[0] == RTP_EXTENSION;
@@ -96,7 +98,7 @@ public int CalculatePacketSize(int encryptedLength, EncryptionMode encryptionMod
 			EncryptionMode.XSalsa20Poly1305 => HEADER_SIZE + encryptedLength,
 			EncryptionMode.XSalsa20Poly1305Suffix => HEADER_SIZE + encryptedLength + Interop.SodiumNonceSize,
 			EncryptionMode.XSalsa20Poly1305Lite => HEADER_SIZE + encryptedLength + 4,
-			_ => throw new ArgumentException("Unsupported encryption mode.", nameof(encryptionMode)),
+			_ => throw new ArgumentException("Unsupported encryption mode.", nameof(encryptionMode))
 		};
 
 	/// <summary>
@@ -130,7 +132,5 @@ public void GetDataFromPacket(ReadOnlySpan<byte> packet, out ReadOnlySpan<byte>
 	/// Disposes the Rtp.
 	/// </summary>
 	public void Dispose()
-	{
-
-	}
+	{ }
 }
diff --git a/DisCatSharp.VoiceNext/Codec/Sodium.cs b/DisCatSharp.VoiceNext/Codec/Sodium.cs
index f32be03536..540ab137f6 100644
--- a/DisCatSharp.VoiceNext/Codec/Sodium.cs
+++ b/DisCatSharp.VoiceNext/Codec/Sodium.cs
@@ -45,9 +45,7 @@ static Sodium()
 	{
 		SupportedModes = new ReadOnlyDictionary<string, EncryptionMode>(new Dictionary<string, EncryptionMode>()
 		{
-			["xsalsa20_poly1305_lite"] = EncryptionMode.XSalsa20Poly1305Lite,
-			["xsalsa20_poly1305_suffix"] = EncryptionMode.XSalsa20Poly1305Suffix,
-			["xsalsa20_poly1305"] = EncryptionMode.XSalsa20Poly1305
+			["xsalsa20_poly1305_lite"] = EncryptionMode.XSalsa20Poly1305Lite, ["xsalsa20_poly1305_suffix"] = EncryptionMode.XSalsa20Poly1305Suffix, ["xsalsa20_poly1305"] = EncryptionMode.XSalsa20Poly1305
 		});
 	}
 
diff --git a/DisCatSharp.VoiceNext/DisCatSharp.VoiceNext.csproj b/DisCatSharp.VoiceNext/DisCatSharp.VoiceNext.csproj
index 3b22724175..86bd3a29b9 100644
--- a/DisCatSharp.VoiceNext/DisCatSharp.VoiceNext.csproj
+++ b/DisCatSharp.VoiceNext/DisCatSharp.VoiceNext.csproj
@@ -1,49 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../DisCatSharp.Targets/Version.targets" />
-  <Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
-  <Import Project="../DisCatSharp.Targets/Package.targets" />
-  <Import Project="../DisCatSharp.Targets/NuGet.targets" />
-  <Import Project="../DisCatSharp.Targets/Library.targets" />
-<Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
-
-  <PropertyGroup>
-    <AssemblyName>DisCatSharp.VoiceNext</AssemblyName>
-    <RootNamespace>DisCatSharp.VoiceNext</RootNamespace>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <PackageId>DisCatSharp.VoiceNext</PackageId>
-	<Description>
-DisCatSharp Voice Next Extension
-
-Easy made audio player for discord bots.
-
-Documentation: https://docs.dcs.aitsys.dev/articles/modules/audio/voicenext/prerequisites.html
-	</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Voice,Audio Player</PackageTags>
-	<Nullable>annotations</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
-    <PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="System.Threading.Channels" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DisCatSharp.VoiceNext.Natives\DisCatSharp.VoiceNext.Natives.csproj" />
-  </ItemGroup>
+	<Import Project="../DisCatSharp.Targets/Version.targets" />
+	<Import Project="../DisCatSharp.Targets/DisCatSharp.targets" />
+	<Import Project="../DisCatSharp.Targets/Package.targets" />
+	<Import Project="../DisCatSharp.Targets/NuGet.targets" />
+	<Import Project="../DisCatSharp.Targets/Library.targets" />
+	<Import Project="../DisCatSharp.Targets/InternalsVisibleTo.targets" />
+
+	<PropertyGroup>
+		<AssemblyName>DisCatSharp.VoiceNext</AssemblyName>
+		<RootNamespace>DisCatSharp.VoiceNext</RootNamespace>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<PackageId>DisCatSharp.VoiceNext</PackageId>
+		<Description>
+			DisCatSharp Voice Next Extension
+
+			Easy made audio player for discord bots.
+
+			Documentation: https://docs.dcs.aitsys.dev/articles/modules/audio/voicenext/prerequisites.html
+		</Description>
+		<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Voice,Audio Player</PackageTags>
+		<Nullable>annotations</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="DisCatSharp.Analyzer.Roselyn" Version="6.1.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="DisCatSharp.Attributes" Version="10.4.3" />
+		<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+		<PackageReference Include="System.Threading.Channels" Version="7.0.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\DisCatSharp\DisCatSharp.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\DisCatSharp.VoiceNext.Natives\DisCatSharp.VoiceNext.Natives.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/DisCatSharp.VoiceNext/DiscordClientExtensions.cs b/DisCatSharp.VoiceNext/DiscordClientExtensions.cs
index 3d18e893a4..45eb723740 100644
--- a/DisCatSharp.VoiceNext/DiscordClientExtensions.cs
+++ b/DisCatSharp.VoiceNext/DiscordClientExtensions.cs
@@ -20,7 +20,7 @@ public static class DiscordClientExtensions
 	/// <param name="client">Discord client to create VoiceNext instance for.</param>
 	/// <returns>VoiceNext client instance.</returns>
 	public static VoiceNextExtension UseVoiceNext(this DiscordClient client)
-		=> UseVoiceNext(client, new VoiceNextConfiguration());
+		=> UseVoiceNext(client, new());
 
 	/// <summary>
 	/// Creates a new VoiceNext client with specified settings.
@@ -79,9 +79,7 @@ public static async Task<IReadOnlyDictionary<int, VoiceNextExtension>> GetVoiceN
 		var extensions = new Dictionary<int, VoiceNextExtension>();
 
 		foreach (var shard in client.ShardClients.Values)
-		{
 			extensions.Add(shard.ShardId, shard.GetExtension<VoiceNextExtension>());
-		}
 
 		return new ReadOnlyDictionary<int, VoiceNextExtension>(extensions);
 	}
diff --git a/DisCatSharp.VoiceNext/Entities/AudioSender.cs b/DisCatSharp.VoiceNext/Entities/AudioSender.cs
index 8b76ff5de9..a43cc95924 100644
--- a/DisCatSharp.VoiceNext/Entities/AudioSender.cs
+++ b/DisCatSharp.VoiceNext/Entities/AudioSender.cs
@@ -20,7 +20,7 @@ private enum SequenceWrapState
 	{
 		Normal,
 		AssumeNextLowSequenceIsOverflow,
-		AssumeNextHighSequenceIsOutOfOrder,
+		AssumeNextHighSequenceIsOutOfOrder
 	}
 
 	/// <summary>
@@ -64,7 +64,6 @@ public AudioSender(uint ssrc, OpusDecoder decoder)
 	/// </summary>
 	public void Dispose() => this.Decoder?.Dispose();
 
-
 	/// <summary>
 	/// Accepts the 16-bit sequence number from the next RTP header in the associated stream and
 	/// uses heuristics to (attempt to) convert it into a 64-bit counter that takes into account
diff --git a/DisCatSharp.VoiceNext/Entities/VoicePacket.cs b/DisCatSharp.VoiceNext/Entities/VoicePacket.cs
index 4ab3d09e0e..fc96fd871c 100644
--- a/DisCatSharp.VoiceNext/Entities/VoicePacket.cs
+++ b/DisCatSharp.VoiceNext/Entities/VoicePacket.cs
@@ -8,10 +8,12 @@ internal struct VoicePacket
 	/// Gets the bytes.
 	/// </summary>
 	public ReadOnlyMemory<byte> Bytes { get; }
+
 	/// <summary>
 	/// Gets the millisecond duration.
 	/// </summary>
 	public int MillisecondDuration { get; }
+
 	/// <summary>
 	/// Gets or sets a value indicating whether is silence.
 	/// </summary>
diff --git a/DisCatSharp.VoiceNext/EventArgs/VoiceReceiveEventArgs.cs b/DisCatSharp.VoiceNext/EventArgs/VoiceReceiveEventArgs.cs
index ffdd4e2719..b4aac4e81b 100644
--- a/DisCatSharp.VoiceNext/EventArgs/VoiceReceiveEventArgs.cs
+++ b/DisCatSharp.VoiceNext/EventArgs/VoiceReceiveEventArgs.cs
@@ -15,7 +15,6 @@ public class VoiceReceiveEventArgs : DiscordEventArgs
 	/// </summary>
 	public uint Ssrc { get; internal set; }
 
-
 	/// <summary>
 	/// Gets the user that sent the audio data.
 	/// </summary>
diff --git a/DisCatSharp.VoiceNext/GlobalSuppressions.cs b/DisCatSharp.VoiceNext/GlobalSuppressions.cs
index 6ff741a513..6bfbf01085 100644
--- a/DisCatSharp.VoiceNext/GlobalSuppressions.cs
+++ b/DisCatSharp.VoiceNext/GlobalSuppressions.cs
@@ -1,8 +1,8 @@
-
 // This file is used by Code Analysis to maintain SuppressMessage
 // attributes that are applied to this project.
 // Project-level suppressions either have no target or are given
 // a specific target and scoped to a namespace, type, member, etc.
+
 using System.Diagnostics.CodeAnalysis;
 
 [assembly: SuppressMessage("Usage", "CA2254:Template should be a static expression", Justification = "<Pending>", Scope = "member", Target = "~M:DisCatSharp.VoiceNext.VoiceNextConnection.Dispose")]
diff --git a/DisCatSharp.VoiceNext/Interop/Bindings.cs b/DisCatSharp.VoiceNext/Interop/Bindings.cs
index e81833c08d..fdd4f42d55 100644
--- a/DisCatSharp.VoiceNext/Interop/Bindings.cs
+++ b/DisCatSharp.VoiceNext/Interop/Bindings.cs
@@ -41,14 +41,14 @@ internal static unsafe class Bindings
 	public static IntPtr CreateEncoder(int sampleRate, int channelCount, int application)
 	{
 		var encoder = opus_encoder_create(sampleRate, channelCount, application, out var error);
-		return error == OpusError.Ok ? encoder : throw new Exception($"Failed to instantiate Opus encoder: {error} ({(int)error})");
+		return error == OpusError.Ok ? encoder : throw new($"Failed to instantiate Opus encoder: {error} ({(int)error})");
 	}
 
 	public static void SetEncoderOption(IntPtr encoder, OpusControl option, int value)
 	{
 		var error = OpusError.Ok;
 		if ((error = opus_encoder_ctl(encoder, option, value)) != OpusError.Ok)
-			throw new Exception($"Failed to set Opus encoder option: ${error} ({(int)error})");
+			throw new($"Failed to set Opus encoder option: ${error} ({(int)error})");
 	}
 
 	public static void Encode(IntPtr encoder, ReadOnlySpan<byte> pcm, int frameSize, ref Span<byte> data)
@@ -62,7 +62,7 @@ public static void Encode(IntPtr encoder, ReadOnlySpan<byte> pcm, int frameSize,
 		if (length < 0)
 		{
 			var error = (OpusError)length;
-			throw new Exception($"Failed to encode PCM data: {error} ({length})");
+			throw new($"Failed to encode PCM data: {error} ({length})");
 		}
 
 		data = data[..length];
@@ -71,7 +71,7 @@ public static void Encode(IntPtr encoder, ReadOnlySpan<byte> pcm, int frameSize,
 	public static IntPtr CreateDecoder(int sampleRate, int channelCount)
 	{
 		var decoder = opus_decoder_create(sampleRate, channelCount, out var error);
-		return error == OpusError.Ok ? decoder : throw new Exception($"Failed to instantiate Opus decoder: {error} ({(int)error})");
+		return error == OpusError.Ok ? decoder : throw new($"Failed to instantiate Opus decoder: {error} ({(int)error})");
 	}
 
 	public static int Decode(IntPtr decoder, ReadOnlySpan<byte> data, int frameSize, Span<byte> pcm, bool useFec)
@@ -85,7 +85,7 @@ public static int Decode(IntPtr decoder, ReadOnlySpan<byte> data, int frameSize,
 		if (length < 0)
 		{
 			var error = (OpusError)length;
-			throw new Exception($"Failed to decode PCM data: {error} ({length})");
+			throw new($"Failed to decode PCM data: {error} ({length})");
 		}
 
 		return length;
@@ -101,7 +101,7 @@ public static int Decode(IntPtr decoder, int frameSize, Span<byte> pcm)
 		if (length < 0)
 		{
 			var error = (OpusError)length;
-			throw new Exception($"Failed to decode PCM data: {error} ({length})");
+			throw new($"Failed to decode PCM data: {error} ({length})");
 		}
 
 		return length;
@@ -120,10 +120,7 @@ public static OpusPacketMetrics GetPacketMetrics(ReadOnlySpan<byte> data, int sa
 
 		return new()
 		{
-			ChannelCount = channels,
-			FrameCount = frames,
-			SamplesPerFrame = samplesPerFrame,
-			FrameSize = frames * samplesPerFrame
+			ChannelCount = channels, FrameCount = frames, SamplesPerFrame = samplesPerFrame, FrameSize = frames * samplesPerFrame
 		};
 	}
 
diff --git a/DisCatSharp.VoiceNext/Interop/OpusControl.cs b/DisCatSharp.VoiceNext/Interop/OpusControl.cs
index 1c1dac31ce..c96c31cdfd 100644
--- a/DisCatSharp.VoiceNext/Interop/OpusControl.cs
+++ b/DisCatSharp.VoiceNext/Interop/OpusControl.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.VoiceNext.Interop;
 
 internal enum OpusControl : int
diff --git a/DisCatSharp.VoiceNext/Interop/OpusError.cs b/DisCatSharp.VoiceNext/Interop/OpusError.cs
index 49ebbb6424..faac9c105f 100644
--- a/DisCatSharp.VoiceNext/Interop/OpusError.cs
+++ b/DisCatSharp.VoiceNext/Interop/OpusError.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.VoiceNext.Interop;
 
 internal enum OpusError
diff --git a/DisCatSharp.VoiceNext/Interop/OpusPacketMetrics.cs b/DisCatSharp.VoiceNext/Interop/OpusPacketMetrics.cs
index 220d937f28..31c763f050 100644
--- a/DisCatSharp.VoiceNext/Interop/OpusPacketMetrics.cs
+++ b/DisCatSharp.VoiceNext/Interop/OpusPacketMetrics.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.VoiceNext.Interop;
 
 internal struct OpusPacketMetrics
diff --git a/DisCatSharp.VoiceNext/Interop/OpusSignal.cs b/DisCatSharp.VoiceNext/Interop/OpusSignal.cs
index a278ebc566..5559820ab8 100644
--- a/DisCatSharp.VoiceNext/Interop/OpusSignal.cs
+++ b/DisCatSharp.VoiceNext/Interop/OpusSignal.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.VoiceNext.Interop;
 
 internal enum OpusSignal : int
diff --git a/DisCatSharp.VoiceNext/StreamExtensions.cs b/DisCatSharp.VoiceNext/StreamExtensions.cs
index c268f4a001..71f244a6a7 100644
--- a/DisCatSharp.VoiceNext/StreamExtensions.cs
+++ b/DisCatSharp.VoiceNext/StreamExtensions.cs
@@ -37,9 +37,7 @@ public static async Task CopyToAsync(this Stream source, VoiceTransmitSink desti
 		{
 			int bytesRead;
 			while ((bytesRead = await source.ReadAsync(buffer.AsMemory(0, bufferLength), cancellationToken).ConfigureAwait(false)) != 0)
-			{
-				await destination.WriteAsync(new ReadOnlyMemory<byte>(buffer, 0, bytesRead), cancellationToken).ConfigureAwait(false);
-			}
+				await destination.WriteAsync(new(buffer, 0, bytesRead), cancellationToken).ConfigureAwait(false);
 		}
 		finally
 		{
diff --git a/DisCatSharp.VoiceNext/VoiceApplication.cs b/DisCatSharp.VoiceNext/VoiceApplication.cs
index bf196b21d0..a9db1c186d 100644
--- a/DisCatSharp.VoiceNext/VoiceApplication.cs
+++ b/DisCatSharp.VoiceNext/VoiceApplication.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.VoiceNext;
 
 /// <summary>
diff --git a/DisCatSharp.VoiceNext/VoiceNextConfiguration.cs b/DisCatSharp.VoiceNext/VoiceNextConfiguration.cs
index 1583f0890a..96d1b01d62 100644
--- a/DisCatSharp.VoiceNext/VoiceNextConfiguration.cs
+++ b/DisCatSharp.VoiceNext/VoiceNextConfiguration.cs
@@ -37,7 +37,7 @@ public VoiceNextConfiguration() { }
 	/// <param name="other">Configuration the properties of which are to be copied.</param>
 	public VoiceNextConfiguration(VoiceNextConfiguration other)
 	{
-		this.AudioFormat = new AudioFormat(other.AudioFormat.SampleRate, other.AudioFormat.ChannelCount, other.AudioFormat.VoiceApplication);
+		this.AudioFormat = new(other.AudioFormat.SampleRate, other.AudioFormat.ChannelCount, other.AudioFormat.VoiceApplication);
 		this.EnableIncoming = other.EnableIncoming;
 	}
 }
diff --git a/DisCatSharp.VoiceNext/VoiceNextConnection.cs b/DisCatSharp.VoiceNext/VoiceNextConnection.cs
index 7780d05bd2..9829b06404 100644
--- a/DisCatSharp.VoiceNext/VoiceNextConnection.cs
+++ b/DisCatSharp.VoiceNext/VoiceNextConnection.cs
@@ -42,6 +42,7 @@ public event AsyncEventHandler<VoiceNextConnection, UserSpeakingEventArgs> UserS
 		add => this._userSpeaking.Register(value);
 		remove => this._userSpeaking.Unregister(value);
 	}
+
 	private readonly AsyncEvent<VoiceNextConnection, UserSpeakingEventArgs> _userSpeaking;
 
 	/// <summary>
@@ -52,6 +53,7 @@ public event AsyncEventHandler<VoiceNextConnection, VoiceUserJoinEventArgs> User
 		add => this._userJoined.Register(value);
 		remove => this._userJoined.Unregister(value);
 	}
+
 	private readonly AsyncEvent<VoiceNextConnection, VoiceUserJoinEventArgs> _userJoined;
 
 	/// <summary>
@@ -62,6 +64,7 @@ public event AsyncEventHandler<VoiceNextConnection, VoiceUserLeaveEventArgs> Use
 		add => this._userLeft.Register(value);
 		remove => this._userLeft.Unregister(value);
 	}
+
 	private readonly AsyncEvent<VoiceNextConnection, VoiceUserLeaveEventArgs> _userLeft;
 
 	/// <summary>
@@ -72,6 +75,7 @@ public event AsyncEventHandler<VoiceNextConnection, VoiceReceiveEventArgs> Voice
 		add => this._voiceReceived.Register(value);
 		remove => this._voiceReceived.Unregister(value);
 	}
+
 	private readonly AsyncEvent<VoiceNextConnection, VoiceReceiveEventArgs> _voiceReceived;
 
 	/// <summary>
@@ -82,6 +86,7 @@ public event AsyncEventHandler<VoiceNextConnection, SocketErrorEventArgs> VoiceS
 		add => this._voiceSocketError.Register(value);
 		remove => this._voiceSocketError.Unregister(value);
 	}
+
 	private readonly AsyncEvent<VoiceNextConnection, SocketErrorEventArgs> _voiceSocketError;
 
 	internal event VoiceDisconnectedEventHandler VoiceDisconnected;
@@ -135,6 +140,7 @@ public event AsyncEventHandler<VoiceNextConnection, SocketErrorEventArgs> VoiceS
 	/// Gets or sets the token source.
 	/// </summary>
 	private CancellationTokenSource _tokenSource;
+
 	/// <summary>
 	/// Gets the token.
 	/// </summary>
@@ -150,10 +156,12 @@ private CancellationToken TOKEN
 	/// Gets or sets the server data.
 	/// </summary>
 	internal VoiceServerUpdatePayload ServerData { get; set; }
+
 	/// <summary>
 	/// Gets or sets the state data.
 	/// </summary>
 	internal VoiceStateUpdatePayload StateData { get; set; }
+
 	/// <summary>
 	/// Gets or sets a value indicating whether resume.
 	/// </summary>
@@ -183,6 +191,7 @@ private CancellationToken TOKEN
 	/// Gets or sets the selected encryption mode.
 	/// </summary>
 	private EncryptionMode _selectedEncryptionMode;
+
 	/// <summary>
 	/// Gets or sets the nonce.
 	/// </summary>
@@ -212,10 +221,12 @@ private CancellationToken TOKEN
 	/// Gets or sets the discovered endpoint.
 	/// </summary>
 	private IpEndpoint _discoveredEndpoint;
+
 	/// <summary>
 	/// Gets or sets the web socket endpoint.
 	/// </summary>
 	internal ConnectionEndpoint WebSocketEndpoint { get; set; }
+
 	/// <summary>
 	/// Gets or sets the udp endpoint.
 	/// </summary>
@@ -260,6 +271,7 @@ private CancellationToken TOKEN
 	/// Gets the keepalive timestamps.
 	/// </summary>
 	private readonly ConcurrentDictionary<ulong, long> _keepaliveTimestamps;
+
 	private ulong _lastKeepalive;
 
 	/// <summary>
@@ -271,6 +283,7 @@ private CancellationToken TOKEN
 	/// Gets or sets the sender token source.
 	/// </summary>
 	private CancellationTokenSource _senderTokenSource;
+
 	/// <summary>
 	/// Gets the sender token.
 	/// </summary>
@@ -286,6 +299,7 @@ private CancellationToken SENDER_TOKEN
 	/// Gets or sets the receiver token source.
 	/// </summary>
 	private CancellationTokenSource _receiverTokenSource;
+
 	/// <summary>
 	/// Gets the receiver token.
 	/// </summary>
@@ -301,6 +315,7 @@ private CancellationToken RECEIVER_TOKEN
 	/// Gets or sets the keepalive token source.
 	/// </summary>
 	private CancellationTokenSource _keepaliveTokenSource;
+
 	/// <summary>
 	/// Gets the keepalive token.
 	/// </summary>
@@ -323,6 +338,7 @@ public bool IsPlaying
 	/// </summary>
 	public int WebSocketPing
 		=> Volatile.Read(ref this._wsPing);
+
 	private int _wsPing;
 
 	/// <summary>
@@ -330,6 +346,7 @@ public int WebSocketPing
 	/// </summary>
 	public int UdpPing
 		=> Volatile.Read(ref this._udpPing);
+
 	private int _udpPing;
 
 	private int _queueCount;
@@ -353,21 +370,21 @@ internal VoiceNextConnection(DiscordClient client, DiscordGuild guild, DiscordCh
 		this._discord = client;
 		this._guild = guild;
 		this.TargetChannel = channel;
-		this._transmittingSsrCs = new ConcurrentDictionary<uint, AudioSender>();
+		this._transmittingSsrCs = new();
 
-		this._userSpeaking = new AsyncEvent<VoiceNextConnection, UserSpeakingEventArgs>("VNEXT_USER_SPEAKING", TimeSpan.Zero, this._discord.EventErrorHandler);
-		this._userJoined = new AsyncEvent<VoiceNextConnection, VoiceUserJoinEventArgs>("VNEXT_USER_JOINED", TimeSpan.Zero, this._discord.EventErrorHandler);
-		this._userLeft = new AsyncEvent<VoiceNextConnection, VoiceUserLeaveEventArgs>("VNEXT_USER_LEFT", TimeSpan.Zero, this._discord.EventErrorHandler);
-		this._voiceReceived = new AsyncEvent<VoiceNextConnection, VoiceReceiveEventArgs>("VNEXT_VOICE_RECEIVED", TimeSpan.Zero, this._discord.EventErrorHandler);
-		this._voiceSocketError = new AsyncEvent<VoiceNextConnection, SocketErrorEventArgs>("VNEXT_WS_ERROR", TimeSpan.Zero, this._discord.EventErrorHandler);
-		this._tokenSource = new CancellationTokenSource();
+		this._userSpeaking = new("VNEXT_USER_SPEAKING", TimeSpan.Zero, this._discord.EventErrorHandler);
+		this._userJoined = new("VNEXT_USER_JOINED", TimeSpan.Zero, this._discord.EventErrorHandler);
+		this._userLeft = new("VNEXT_USER_LEFT", TimeSpan.Zero, this._discord.EventErrorHandler);
+		this._voiceReceived = new("VNEXT_VOICE_RECEIVED", TimeSpan.Zero, this._discord.EventErrorHandler);
+		this._voiceSocketError = new("VNEXT_WS_ERROR", TimeSpan.Zero, this._discord.EventErrorHandler);
+		this._tokenSource = new();
 
 		this._configuration = config;
 		this._isInitialized = false;
 		this._isDisposed = false;
-		this._opus = new Opus(this.AudioFormat);
+		this._opus = new(this.AudioFormat);
 		//this.Sodium = new Sodium();
-		this._rtp = new Rtp();
+		this._rtp = new();
 
 		this.ServerData = server;
 		this.StateData = state;
@@ -382,17 +399,19 @@ internal VoiceNextConnection(DiscordClient client, DiscordGuild guild, DiscordCh
 			epp = int.Parse(eps[(epi + 1)..]);
 		}
 		else
-		{
 			eph = eps;
-		}
-		this.WebSocketEndpoint = new ConnectionEndpoint { Hostname = eph, Port = epp };
 
-		this._readyWait = new TaskCompletionSource<bool>();
+		this.WebSocketEndpoint = new()
+		{
+			Hostname = eph, Port = epp
+		};
+
+		this._readyWait = new();
 
 		this._playingWait = null;
 		this._transmitChannel = Channel.CreateBounded<RawVoicePacket>(new BoundedChannelOptions(this._configuration.PacketQueueSize));
-		this._keepaliveTimestamps = new ConcurrentDictionary<ulong, long>();
-		this._pauseEvent = new AsyncManualResetEvent(true);
+		this._keepaliveTimestamps = new();
+		this._pauseEvent = new(true);
 
 		this._udpClient = this._discord.Configuration.UdpClientFactory();
 		this._voiceWs = this._discord.Configuration.WebSocketClientFactory(this._discord.Configuration.Proxy, this._discord.ServiceProvider);
@@ -415,9 +434,7 @@ internal Task ConnectAsync()
 	{
 		var gwuri = new UriBuilder
 		{
-			Scheme = "wss",
-			Host = this.WebSocketEndpoint.Hostname,
-			Query = "encoding=json&v=4"
+			Scheme = "wss", Host = this.WebSocketEndpoint.Hostname, Query = "encoding=json&v=4"
 		};
 
 		return this._voiceWs.ConnectAsync(gwuri.Uri);
@@ -444,10 +461,7 @@ internal async Task StartAsync()
 			vdp.OpCode = 0;
 			vdp.Payload = new VoiceIdentifyPayload
 			{
-				ServerId = this.ServerData.GuildId,
-				UserId = this.StateData.UserId.Value,
-				SessionId = this.StateData.SessionId,
-				Token = this.ServerData.Token
+				ServerId = this.ServerData.GuildId, UserId = this.StateData.UserId.Value, SessionId = this.StateData.SessionId, Token = this.ServerData.Token
 			};
 			this.Resume = true;
 		}
@@ -456,11 +470,10 @@ internal async Task StartAsync()
 			vdp.OpCode = 7;
 			vdp.Payload = new VoiceIdentifyPayload
 			{
-				ServerId = this.ServerData.GuildId,
-				SessionId = this.StateData.SessionId,
-				Token = this.ServerData.Token
+				ServerId = this.ServerData.GuildId, SessionId = this.StateData.SessionId, Token = this.ServerData.Token
 			};
 		}
+
 		var vdj = JsonConvert.SerializeObject(vdp, Formatting.None);
 		await this.WsSendAsync(vdj).ConfigureAwait(false);
 	}
@@ -528,7 +541,7 @@ internal bool PreparePacket(ReadOnlySpan<byte> pcm, out byte[] target, out int l
 
 			default:
 				ArrayPool<byte>.Shared.Return(packetArray);
-				throw new Exception("Unsupported encryption mode.");
+				throw new("Unsupported encryption mode.");
 		}
 
 		Span<byte> encrypted = stackalloc byte[Sodium.CalculateTargetSize(opus)];
@@ -570,7 +583,7 @@ private async Task VoiceSenderTask()
 				this._queueCount--;
 
 				if (this._playingWait == null || this._playingWait.Task.IsCompleted)
-					this._playingWait = new TaskCompletionSource<bool>();
+					this._playingWait = new();
 			}
 
 			// Provided by Laura#0090 (214796473689178133); this is Python, but adaptable:
@@ -596,7 +609,7 @@ private async Task VoiceSenderTask()
 			var durationModifier = hasPacket ? rawPacket.Duration / 5 : 4;
 			var cts = Math.Max(Stopwatch.GetTimestamp() - synchronizerTicks, 0);
 			if (cts < synchronizerResolution * durationModifier)
-				await Task.Delay(TimeSpan.FromTicks((long)(((synchronizerResolution * durationModifier) - cts) * tickResolution))).ConfigureAwait(false);
+				await Task.Delay(TimeSpan.FromTicks((long)((synchronizerResolution * durationModifier - cts) * tickResolution))).ConfigureAwait(false);
 
 			synchronizerTicks += synchronizerResolution * durationModifier;
 
@@ -614,7 +627,7 @@ private async Task VoiceSenderTask()
 				{
 					var nullpacket = new byte[nullpcm.Length];
 					var nullpacketmem = nullpacket.AsMemory();
-					await this.EnqueuePacketAsync(new RawVoicePacket(nullpacketmem, 20, true)).ConfigureAwait(false);
+					await this.EnqueuePacketAsync(new(nullpacketmem, 20, true)).ConfigureAwait(false);
 				}
 			}
 			else if (this._queueCount == 0)
@@ -650,7 +663,7 @@ private bool ProcessPacket(ReadOnlySpan<byte> data, ref Memory<byte> opus, ref M
 		{
 			var decoder = this._opus.CreateDecoder();
 
-			vtx = new AudioSender(ssrc, decoder)
+			vtx = new(ssrc, decoder)
 			{
 				// user isn't present as we haven't received a speaking event yet.
 				User = null
@@ -683,12 +696,11 @@ private bool ProcessPacket(ReadOnlySpan<byte> data, ref Memory<byte> opus, ref M
 
 			// Strip extensions, if any
 			if (hasExtension)
-			{
 				// RFC 5285, 4.2 One-Byte header
 				// http://www.rfcreader.com/#rfc5285_line186
 				if (opusSpan[0] == 0xBE && opusSpan[1] == 0xDE)
 				{
-					var headerLen = (opusSpan[2] << 8) | opusSpan[3];
+					var headerLen = opusSpan[2] << 8 | opusSpan[3];
 					var i = 4;
 					for (; i < headerLen + 4; i++)
 					{
@@ -708,15 +720,11 @@ private bool ProcessPacket(ReadOnlySpan<byte> data, ref Memory<byte> opus, ref M
 					opusSpan = opusSpan[i..];
 				}
 
-				// TODO: consider implementing RFC 5285, 4.3. Two-Byte Header
-			}
-
+			// TODO: consider implementing RFC 5285, 4.3. Two-Byte Header
 			if (opusSpan[0] == 0x90)
-			{
 				// I'm not 100% sure what this header is/does, however removing the data causes no
 				// real issues, and has the added benefit of removing a lot of noise.
 				opusSpan = opusSpan[2..];
-			}
 
 			if (gap == 1)
 			{
@@ -771,7 +779,7 @@ private async Task ProcessVoicePacket(byte[] data)
 				return;
 
 			foreach (var pcmFiller in pcmFillers)
-				await this._voiceReceived.InvokeAsync(this, new VoiceReceiveEventArgs(this._discord.ServiceProvider)
+				await this._voiceReceived.InvokeAsync(this, new(this._discord.ServiceProvider)
 				{
 					Ssrc = vtx.Ssrc,
 					User = vtx.User,
@@ -781,7 +789,7 @@ private async Task ProcessVoicePacket(byte[] data)
 					AudioDuration = audioFormat.CalculateSampleDuration(pcmFiller.Length)
 				}).ConfigureAwait(false);
 
-			await this._voiceReceived.InvokeAsync(this, new VoiceReceiveEventArgs(this._discord.ServiceProvider)
+			await this._voiceReceived.InvokeAsync(this, new(this._discord.ServiceProvider)
 			{
 				Ssrc = vtx.Ssrc,
 				User = vtx.User,
@@ -857,8 +865,7 @@ public async Task SendSpeakingAsync(SpeakingFlags flags = SpeakingFlags.Micropho
 				OpCode = 5,
 				Payload = new VoiceSpeakingPayload
 				{
-					Speaking = flags,
-					Delay = 0
+					Speaking = flags, Delay = 0
 				}
 			};
 
@@ -877,7 +884,7 @@ public VoiceTransmitSink GetTransmitSink(int sampleDuration = 20)
 		if (!AudioFormat.AllowedSampleDurations.Contains(sampleDuration))
 			throw new ArgumentOutOfRangeException(nameof(sampleDuration), "Invalid PCM sample duration specified.");
 
-		this._transmitStream ??= new VoiceTransmitSink(this, sampleDuration);
+		this._transmitStream ??= new(this, sampleDuration);
 
 		return this._transmitStream;
 	}
@@ -972,7 +979,6 @@ private async Task HeartbeatAsync()
 
 		var token = this.TOKEN;
 		while (true)
-		{
 			try
 			{
 				token.ThrowIfCancellationRequested();
@@ -982,8 +988,7 @@ private async Task HeartbeatAsync()
 
 				var hbd = new VoiceDispatch
 				{
-					OpCode = 3,
-					Payload = UnixTimestamp(dt)
+					OpCode = 3, Payload = UnixTimestamp(dt)
 				};
 				var hbj = JsonConvert.SerializeObject(hbd);
 				await this.WsSendAsync(hbj).ConfigureAwait(false);
@@ -995,7 +1000,6 @@ private async Task HeartbeatAsync()
 			{
 				return;
 			}
-		}
 	}
 
 	/// <summary>
@@ -1041,10 +1045,9 @@ private async Task Stage1(VoiceReadyPayload voiceReady)
 
 		var ipd = await this._udpClient.ReceiveAsync().ConfigureAwait(false);
 		ReadPacket(ipd, out var ip, out var port);
-		this._discoveredEndpoint = new IpEndpoint
+		this._discoveredEndpoint = new()
 		{
-			Address = ip,
-			Port = port
+			Address = ip, Port = port
 		};
 		this._discord.Logger.LogTrace(VoiceNextEvents.VoiceHandshake, "Endpoint discovery finished - discovered endpoint is {0}:{1}", ip, port);
 
@@ -1082,21 +1085,19 @@ void ReadPacket(byte[] packet, out System.Net.IPAddress decodedIp, out ushort de
 			Payload = new VoiceSelectProtocolPayload
 			{
 				Protocol = "udp",
-				Data = new VoiceSelectProtocolPayloadData
+				Data = new()
 				{
-					Address = this._discoveredEndpoint.Address.ToString(),
-					Port = (ushort)this._discoveredEndpoint.Port,
-					Mode = selectedEncryptionMode.Key
+					Address = this._discoveredEndpoint.Address.ToString(), Port = (ushort)this._discoveredEndpoint.Port, Mode = selectedEncryptionMode.Key
 				}
 			}
 		};
 		var vsj = JsonConvert.SerializeObject(vsp, Formatting.None);
 		await this.WsSendAsync(vsj).ConfigureAwait(false);
 
-		this._senderTokenSource = new CancellationTokenSource();
+		this._senderTokenSource = new();
 		this._senderTask = Task.Run(this.VoiceSenderTask, this.SENDER_TOKEN);
 
-		this._receiverTokenSource = new CancellationTokenSource();
+		this._receiverTokenSource = new();
 		this._receiverTask = Task.Run(this.UdpReceiverTask, this.RECEIVER_TOKEN);
 	}
 
@@ -1111,7 +1112,7 @@ private async Task Stage2(VoiceSessionDescriptionPayload voiceSessionDescription
 		this._discord.Logger.LogTrace(VoiceNextEvents.VoiceHandshake, "Discord updated encryption mode - new mode is {0}", this._selectedEncryptionMode);
 
 		// start keepalive
-		this._keepaliveTokenSource = new CancellationTokenSource();
+		this._keepaliveTokenSource = new();
 		this._keepaliveTask = this.KeepaliveAsync();
 
 		// send 3 packets of silence to get things going
@@ -1120,7 +1121,7 @@ private async Task Stage2(VoiceSessionDescriptionPayload voiceSessionDescription
 		{
 			var nullPcm = new byte[nullpcm.Length];
 			var nullpacketmem = nullPcm.AsMemory();
-			await this.EnqueuePacketAsync(new RawVoicePacket(nullpacketmem, 20, true)).ConfigureAwait(false);
+			await this.EnqueuePacketAsync(new(nullpacketmem, 20, true)).ConfigureAwait(false);
 		}
 
 		this._isInitialized = true;
@@ -1143,7 +1144,7 @@ private async Task HandleDispatch(JObject jo)
 				this._discord.Logger.LogTrace(VoiceNextEvents.VoiceDispatch, "Received READY (OP2)");
 				var vrp = opp.ToObject<VoiceReadyPayload>();
 				this._ssrc = vrp.Ssrc;
-				this.UdpEndpoint = new ConnectionEndpoint(vrp.Address, vrp.Port);
+				this.UdpEndpoint = new(vrp.Address, vrp.Port);
 				// this is not the valid interval
 				// oh, discord
 				//this.HeartbeatInterval = vrp.HeartbeatInterval;
@@ -1155,27 +1156,23 @@ private async Task HandleDispatch(JObject jo)
 				this._discord.Logger.LogTrace(VoiceNextEvents.VoiceDispatch, "Received SESSION_DESCRIPTION (OP4)");
 				var vsd = opp.ToObject<VoiceSessionDescriptionPayload>();
 				this._key = vsd.SecretKey;
-				this._sodium = new Sodium(this._key.AsMemory());
+				this._sodium = new(this._key.AsMemory());
 				await this.Stage2(vsd).ConfigureAwait(false);
 				break;
 
 			case 5: // SPEAKING
-					// Don't spam OP5
-					// No longer spam, Discord supposedly doesn't send many of these
+				// Don't spam OP5
+				// No longer spam, Discord supposedly doesn't send many of these
 				this._discord.Logger.LogTrace(VoiceNextEvents.VoiceDispatch, "Received SPEAKING (OP5)");
 				var spd = opp.ToObject<VoiceSpeakingPayload>();
 				var foundUserInCache = this._discord.TryGetCachedUserInternal(spd.UserId.Value, out var resolvedUser);
 				var spk = new UserSpeakingEventArgs(this._discord.ServiceProvider)
 				{
-					Speaking = spd.Speaking,
-					Ssrc = spd.Ssrc.Value,
-					User = resolvedUser,
+					Speaking = spd.Speaking, Ssrc = spd.Ssrc.Value, User = resolvedUser
 				};
 
 				if (foundUserInCache && this._transmittingSsrCs.TryGetValue(spk.Ssrc, out var txssrc5) && txssrc5.Id == 0)
-				{
 					txssrc5.User = spk.User;
-				}
 				else
 				{
 					var opus = this._opus.CreateDecoder();
@@ -1200,7 +1197,7 @@ private async Task HandleDispatch(JObject jo)
 				break;
 
 			case 8: // HELLO
-					// this sends a heartbeat interval that we need to use for heartbeating
+				// this sends a heartbeat interval that we need to use for heartbeating
 				this._discord.Logger.LogTrace(VoiceNextEvents.VoiceDispatch, "Received HELLO (OP8)");
 				this._heartbeatInterval = opp["heartbeat_interval"].ToObject<int>();
 				break;
@@ -1214,18 +1211,21 @@ private async Task HandleDispatch(JObject jo)
 				this._discord.Logger.LogTrace(VoiceNextEvents.VoiceDispatch, "Received CLIENT_CONNECTED (OP12)");
 				var ujpd = opp.ToObject<VoiceUserJoinPayload>();
 				var usrj = await this._discord.GetUserAsync(ujpd.UserId, true).ConfigureAwait(false);
+			{
+				var opus = this._opus.CreateDecoder();
+				var vtx = new AudioSender(ujpd.Ssrc, opus)
 				{
-					var opus = this._opus.CreateDecoder();
-					var vtx = new AudioSender(ujpd.Ssrc, opus)
-					{
-						User = usrj
-					};
+					User = usrj
+				};
 
-					if (!this._transmittingSsrCs.TryAdd(vtx.Ssrc, vtx))
-						this._opus.DestroyDecoder(opus);
-				}
+				if (!this._transmittingSsrCs.TryAdd(vtx.Ssrc, vtx))
+					this._opus.DestroyDecoder(opus);
+			}
 
-				await this._userJoined.InvokeAsync(this, new VoiceUserJoinEventArgs(this._discord.ServiceProvider) { User = usrj, Ssrc = ujpd.Ssrc }).ConfigureAwait(false);
+				await this._userJoined.InvokeAsync(this, new(this._discord.ServiceProvider)
+				{
+					User = usrj, Ssrc = ujpd.Ssrc
+				}).ConfigureAwait(false);
 				break;
 
 			case 13: // CLIENT_DISCONNECTED
@@ -1239,10 +1239,9 @@ private async Task HandleDispatch(JObject jo)
 				}
 
 				var usrl = await this._discord.GetUserAsync(ulpd.UserId, true).ConfigureAwait(false);
-				await this._userLeft.InvokeAsync(this, new VoiceUserLeaveEventArgs(this._discord.ServiceProvider)
+				await this._userLeft.InvokeAsync(this, new(this._discord.ServiceProvider)
 				{
-					User = usrl,
-					Ssrc = txssrc.Key
+					User = usrl, Ssrc = txssrc.Key
 				}).ConfigureAwait(false);
 				break;
 
@@ -1273,7 +1272,7 @@ private async Task VoiceWS_SocketClosed(IWebSocketClient client, SocketCloseEven
 		if (!this._isDisposed)
 		{
 			this._tokenSource.Cancel();
-			this._tokenSource = new CancellationTokenSource();
+			this._tokenSource = new();
 			this._voiceWs = this._discord.Configuration.WebSocketClientFactory(this._discord.Configuration.Proxy, this._discord.ServiceProvider);
 			this._voiceWs.Disconnected += this.VoiceWS_SocketClosed;
 			this._voiceWs.MessageReceived += this.VoiceWS_SocketMessage;
@@ -1318,7 +1317,10 @@ private Task VoiceWS_SocketOpened(IWebSocketClient client, SocketEventArgs e)
 	/// <param name="e">The e.</param>
 	/// <returns>A Task.</returns>
 	private Task VoiceWs_SocketException(IWebSocketClient client, SocketErrorEventArgs e)
-		=> this._voiceSocketError.InvokeAsync(this, new SocketErrorEventArgs(this._discord.ServiceProvider) { Exception = e.Exception });
+		=> this._voiceSocketError.InvokeAsync(this, new(this._discord.ServiceProvider)
+		{
+			Exception = e.Exception
+		});
 
 	/// <summary>
 	/// Ws the send async.
diff --git a/DisCatSharp.VoiceNext/VoiceNextExtension.cs b/DisCatSharp.VoiceNext/VoiceNextExtension.cs
index 55a1cd9137..9a6a4173a8 100644
--- a/DisCatSharp.VoiceNext/VoiceNextExtension.cs
+++ b/DisCatSharp.VoiceNext/VoiceNextExtension.cs
@@ -48,12 +48,12 @@ public sealed class VoiceNextExtension : BaseExtension
 	/// <param name="config">The config.</param>
 	internal VoiceNextExtension(VoiceNextConfiguration config)
 	{
-		this._configuration = new VoiceNextConfiguration(config);
+		this._configuration = new(config);
 		this.IsIncomingEnabled = config.EnableIncoming;
 
-		this._activeConnections = new ConcurrentDictionary<ulong, VoiceNextConnection>();
-		this._voiceStateUpdates = new ConcurrentDictionary<ulong, TaskCompletionSource<VoiceStateUpdateEventArgs>>();
-		this._voiceServerUpdates = new ConcurrentDictionary<ulong, TaskCompletionSource<VoiceServerUpdateEventArgs>>();
+		this._activeConnections = new();
+		this._voiceStateUpdates = new();
+		this._voiceServerUpdates = new();
 	}
 
 	/// <summary>
@@ -102,10 +102,7 @@ public async Task<VoiceNextConnection> ConnectAsync(DiscordChannel channel)
 			OpCode = 4,
 			Payload = new VoiceStateUpdatePayload
 			{
-				GuildId = gld.Id,
-				ChannelId = channel.Id,
-				Deafened = false,
-				Muted = false
+				GuildId = gld.Id, ChannelId = channel.Id, Deafened = false, Muted = false
 			}
 		};
 		var vsj = JsonConvert.SerializeObject(vsd, Formatting.None);
@@ -114,15 +111,12 @@ public async Task<VoiceNextConnection> ConnectAsync(DiscordChannel channel)
 		var vstu = await vstut.Task.ConfigureAwait(false);
 		var vstup = new VoiceStateUpdatePayload
 		{
-			SessionId = vstu.SessionId,
-			UserId = vstu.User.Id
+			SessionId = vstu.SessionId, UserId = vstu.User.Id
 		};
 		var vsru = await vsrut.Task.ConfigureAwait(false);
 		var vsrup = new VoiceServerUpdatePayload
 		{
-			Endpoint = vsru.Endpoint,
-			GuildId = vsru.Guild.Id,
-			Token = vsru.VoiceToken
+			Endpoint = vsru.Endpoint, GuildId = vsru.Guild.Id, Token = vsru.VoiceToken
 		};
 
 		var vnc = new VoiceNextConnection(this.Client, gld, channel, this._configuration, vsrup, vstup);
@@ -156,8 +150,7 @@ private async Task Vnc_VoiceDisconnected(DiscordGuild guild)
 			OpCode = 4,
 			Payload = new VoiceStateUpdatePayload
 			{
-				GuildId = guild.Id,
-				ChannelId = null
+				GuildId = guild.Id, ChannelId = null
 			}
 		};
 		var vsj = JsonConvert.SerializeObject(vsd, Formatting.None);
@@ -208,11 +201,9 @@ private async Task Client_VoiceServerUpdate(DiscordClient client, VoiceServerUpd
 
 		if (this._activeConnections.TryGetValue(e.Guild.Id, out var vnc))
 		{
-			vnc.ServerData = new VoiceServerUpdatePayload
+			vnc.ServerData = new()
 			{
-				Endpoint = e.Endpoint,
-				GuildId = e.Guild.Id,
-				Token = e.VoiceToken
+				Endpoint = e.Endpoint, GuildId = e.Guild.Id, Token = e.VoiceToken
 			};
 
 			var eps = e.Endpoint;
@@ -225,10 +216,12 @@ private async Task Client_VoiceServerUpdate(DiscordClient client, VoiceServerUpd
 				epp = int.Parse(eps[(epi + 1)..]);
 			}
 			else
-			{
 				eph = eps;
-			}
-			vnc.WebSocketEndpoint = new ConnectionEndpoint { Hostname = eph, Port = epp };
+
+			vnc.WebSocketEndpoint = new()
+			{
+				Hostname = eph, Port = epp
+			};
 
 			vnc.Resume = false;
 			await vnc.ReconnectAsync().ConfigureAwait(false);
diff --git a/DisCatSharp.VoiceNext/VoiceTransmitSink.cs b/DisCatSharp.VoiceNext/VoiceTransmitSink.cs
index 8c94c04918..e1fd980d04 100644
--- a/DisCatSharp.VoiceNext/VoiceTransmitSink.cs
+++ b/DisCatSharp.VoiceNext/VoiceTransmitSink.cs
@@ -41,6 +41,7 @@ public double VolumeModifier
 			this._volume = value;
 		}
 	}
+
 	private double _volume = 1.0;
 
 	/// <summary>
@@ -85,8 +86,8 @@ internal VoiceTransmitSink(VoiceNextConnection vnc, int pcmBufferDuration)
 		this._pcmBuffer = new byte[vnc.AudioFormat.CalculateSampleSize(pcmBufferDuration)];
 		this._pcmMemory = this._pcmBuffer.AsMemory();
 		this._pcmBufferLength = 0;
-		this._writeSemaphore = new SemaphoreSlim(1, 1);
-		this._filters = new List<IVoiceFilter>();
+		this._writeSemaphore = new(1, 1);
+		this._filters = new();
 	}
 
 	/// <summary>
@@ -96,7 +97,7 @@ internal VoiceTransmitSink(VoiceNextConnection vnc, int pcmBufferDuration)
 	/// <param name="offset">Start of the data in the buffer.</param>
 	/// <param name="count">Number of bytes from the buffer.</param>
 	/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
-	public async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken = default) => await this.WriteAsync(new ReadOnlyMemory<byte>(buffer, offset, count), cancellationToken).ConfigureAwait(false);
+	public async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken = default) => await this.WriteAsync(new(buffer, offset, count), cancellationToken).ConfigureAwait(false);
 
 	/// <summary>
 	/// Writes PCM data to the sink. The data is prepared for transmission, and enqueued.
@@ -135,7 +136,7 @@ public async Task WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken canc
 					var packetMemory = packet.AsMemory()[..this._pcmMemory.Length];
 					this._pcmMemory.CopyTo(packetMemory);
 
-					await this._connection.EnqueuePacketAsync(new RawVoicePacket(packetMemory, this.SampleDuration, false, packet), cancellationToken).ConfigureAwait(false);
+					await this._connection.EnqueuePacketAsync(new(packetMemory, this.SampleDuration, false, packet), cancellationToken).ConfigureAwait(false);
 				}
 			}
 		}
@@ -160,7 +161,7 @@ public async Task FlushAsync(CancellationToken cancellationToken = default)
 		var packetMemory = packet.AsMemory()[..pcm.Length];
 		pcm.CopyTo(packetMemory);
 
-		await this._connection.EnqueuePacketAsync(new RawVoicePacket(packetMemory, this.SampleDuration, false, packet), cancellationToken).ConfigureAwait(false);
+		await this._connection.EnqueuePacketAsync(new(packetMemory, this.SampleDuration, false, packet), cancellationToken).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -236,20 +237,14 @@ private void ApplyFiltersSync(Memory<byte> pcmSpan)
 
 		// pass through any filters, if applicable
 		lock (this._filters)
-		{
 			if (this._filters.Any())
-			{
 				foreach (var filter in this._filters)
 					filter.Transform(pcm16, this._connection.AudioFormat, this.SampleDuration);
-			}
-		}
 
 		if (this.VolumeModifier != 1)
-		{
 			// alter volume
 			for (var i = 0; i < pcm16.Length; i++)
 				pcm16[i] = (short)(pcm16[i] * this.VolumeModifier);
-		}
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/BaseExtension.cs b/DisCatSharp/BaseExtension.cs
index 882c6644c1..352c46b832 100644
--- a/DisCatSharp/BaseExtension.cs
+++ b/DisCatSharp/BaseExtension.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp;
 
 /// <summary>
diff --git a/DisCatSharp/Clients/BaseDiscordClient.cs b/DisCatSharp/Clients/BaseDiscordClient.cs
index fbbefc9178..7d599fc55f 100644
--- a/DisCatSharp/Clients/BaseDiscordClient.cs
+++ b/DisCatSharp/Clients/BaseDiscordClient.cs
@@ -1,4 +1,3 @@
-
 #pragma warning disable CS0618
 using System;
 using System.Collections.Concurrent;
@@ -33,7 +32,7 @@ public abstract class BaseDiscordClient : IDisposable
 	/// <summary>
 	/// Gets the api client.
 	/// </summary>
-	internal protected DiscordApiClient ApiClient { get; }
+	protected internal DiscordApiClient ApiClient { get; }
 
 	/// <summary>
 	/// Gets the sentry client.
@@ -48,7 +47,7 @@ public abstract class BaseDiscordClient : IDisposable
 	/// <summary>
 	/// Gets the configuration.
 	/// </summary>
-	internal protected DiscordConfiguration Configuration { get; }
+	protected internal DiscordConfiguration Configuration { get; }
 
 	/// <summary>
 	/// Gets the instance of the logger for this client.
@@ -108,6 +107,7 @@ public IReadOnlyDictionary<string, DiscordVoiceRegion> VoiceRegions
 	/// Gets the list of available voice regions. This property is meant as a way to modify <see cref="VoiceRegions"/>.
 	/// </summary>
 	protected internal ConcurrentDictionary<string, DiscordVoiceRegion> InternalVoiceRegions { get; set; }
+
 	internal Lazy<IReadOnlyDictionary<string, DiscordVoiceRegion>> VoiceRegionsLazy;
 
 	/// <summary>
@@ -138,9 +138,11 @@ protected BaseDiscordClient(DiscordConfiguration config)
 				x.Format = ConsoleLoggerFormat.Default;
 				x.TimestampFormat = this.Configuration.LogTimestampFormat;
 				x.LogToStandardErrorThreshold = this.Configuration.MinimumLogLevel;
-
 			});
-			var optionsFactory = new OptionsFactory<ConsoleLoggerOptions>(new[] { configureNamedOptions }, Enumerable.Empty<IPostConfigureOptions<ConsoleLoggerOptions>>());
+			var optionsFactory = new OptionsFactory<ConsoleLoggerOptions>(new[]
+			{
+				configureNamedOptions
+			}, Enumerable.Empty<IPostConfigureOptions<ConsoleLoggerOptions>>());
 			var optionsMonitor = new OptionsMonitor<ConsoleLoggerOptions>(optionsFactory, Enumerable.Empty<IOptionsChangeTokenSource<ConsoleLoggerOptions>>(), new OptionsCache<ConsoleLoggerOptions>());
 
 			var l = new ConsoleLoggerProvider(optionsMonitor);
@@ -161,7 +163,6 @@ protected BaseDiscordClient(DiscordConfiguration config)
 
 		if (!this.Configuration.HasShardLogger)
 			if (this.Configuration.LoggerFactory != null && this.Configuration.EnableSentry)
-			{
 				this.Configuration.LoggerFactory.AddSentry(o =>
 				{
 					o.InitializeSdk = true;
@@ -203,15 +204,18 @@ protected BaseDiscordClient(DiscordConfiguration config)
 									Id = this.CurrentUser.Id.ToString(),
 									Username = this.CurrentUser.UsernameWithDiscriminator,
 									Other = new Dictionary<string, string>()
-								{
-									{ "developer", this.Configuration.DeveloperUserId?.ToString() ?? "not_given" },
-									{ "email", this.Configuration.FeedbackEmail ?? "not_given" }
-								}
+									{
+										{
+											"developer", this.Configuration.DeveloperUserId?.ToString() ?? "not_given"
+										},
+										{
+											"email", this.Configuration.FeedbackEmail ?? "not_given"
+										}
+									}
 								};
 						return e;
 					};
 				});
-			}
 
 		if (this.Configuration.EnableSentry)
 			this.Sentry = new(new()
@@ -251,10 +255,14 @@ protected BaseDiscordClient(DiscordConfiguration config)
 								Id = this.CurrentUser.Id.ToString(),
 								Username = this.CurrentUser.UsernameWithDiscriminator,
 								Other = new Dictionary<string, string>()
+								{
+									{
+										"developer", this.Configuration.DeveloperUserId?.ToString() ?? "not_given"
+									},
 									{
-										{ "developer", this.Configuration.DeveloperUserId?.ToString() ?? "not_given" },
-										{ "email", this.Configuration.FeedbackEmail ?? "not_given" }
+										"email", this.Configuration.FeedbackEmail ?? "not_given"
 									}
+								}
 							};
 
 					if (!e.Extra.ContainsKey("Found Fields"))
@@ -282,9 +290,7 @@ protected BaseDiscordClient(DiscordConfiguration config)
 
 		var iv = a.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
 		if (iv != null)
-		{
 			this.VersionString = iv.InformationalVersion;
-		}
 		else
 		{
 			var v = a.GetName().Version;
@@ -325,17 +331,23 @@ public async Task<DiscordApplication> GetCurrentApplicationAsync()
 
 		if (tapp.Team == null)
 		{
-			app.Members = new(new[] { new DiscordUser(tapp.Owner) });
+			app.Members = new(new[]
+			{
+				new DiscordUser(tapp.Owner)
+			});
 			app.Team = null;
 			app.TeamName = null;
-			app.Owner = new DiscordUser(tapp.Owner);
+			app.Owner = new(tapp.Owner);
 		}
 		else
 		{
 			app.Team = new(tapp.Team);
 
 			var members = tapp.Team.Members
-				.Select(x => new DiscordTeamMember(x) { TeamId = app.Team.Id, TeamName = app.Team.Name, User = new(x.User) })
+				.Select(x => new DiscordTeamMember(x)
+				{
+					TeamId = app.Team.Id, TeamName = app.Team.Name, User = new(x.User)
+				})
 				.ToArray();
 
 			foreach (var member in members)
@@ -384,15 +396,22 @@ public async Task<DiscordApplication> GetCurrentApplicationAsync()
 	/// <returns>The updated application.</returns>
 	public async Task<DiscordApplication> UpdateCurrentApplicationInfoAsync(
 		Optional<string?> description,
-		Optional<string?> interactionsEndpointUrl, Optional<string?> roleConnectionsVerificationUrl, Optional<string?> customInstallUrl,
-		Optional<List<string>?> tags, Optional<Stream?> icon, Optional<Stream?> coverImage,
-		Optional<ApplicationFlags> flags, Optional<DiscordApplicationInstallParams?> installParams)
+		Optional<string?> interactionsEndpointUrl,
+		Optional<string?> roleConnectionsVerificationUrl,
+		Optional<string?> customInstallUrl,
+		Optional<List<string>?> tags,
+		Optional<Stream?> icon,
+		Optional<Stream?> coverImage,
+		Optional<ApplicationFlags> flags,
+		Optional<DiscordApplicationInstallParams?> installParams
+	)
 	{
 		var iconb64 = ImageTool.Base64FromStream(icon);
 		var coverImageb64 = ImageTool.Base64FromStream(coverImage);
 		if (tags != null && tags.HasValue && tags.Value != null)
 			if (tags.Value.Any(x => x.Length > 20))
 				throw new InvalidOperationException("Tags can not exceed 20 chars.");
+
 		_ = await this.ApiClient.ModifyCurrentApplicationInfoAsync(description, interactionsEndpointUrl, roleConnectionsVerificationUrl, customInstallUrl, tags, iconb64, coverImageb64, flags, installParams).ConfigureAwait(false);
 		// We use GetCurrentApplicationAsync because modify returns internal data not meant for developers.
 		var app = await this.GetCurrentApplicationAsync().ConfigureAwait(false);
@@ -435,8 +454,12 @@ public virtual async Task InitializeAsync()
 				Username = this.CurrentUser.UsernameWithDiscriminator,
 				Other = new Dictionary<string, string>()
 				{
-					{ "developer", this.Configuration.DeveloperUserId?.ToString() ?? "not_given" },
-					{ "email", this.Configuration.FeedbackEmail ?? "not_given" }
+					{
+						"developer", this.Configuration.DeveloperUserId?.ToString() ?? "not_given"
+					},
+					{
+						"email", this.Configuration.FeedbackEmail ?? "not_given"
+					}
 				}
 			});
 	}
@@ -496,7 +519,10 @@ internal bool TryGetCachedUserInternal(ulong userId, out DiscordUser user)
 		if (this.UserCache.TryGetValue(userId, out user))
 			return true;
 
-		user = new() { Id = userId, Discord = this };
+		user = new()
+		{
+			Id = userId, Discord = this
+		};
 		return false;
 	}
 
diff --git a/DisCatSharp/Clients/DiscordClient.Dispatch.cs b/DisCatSharp/Clients/DiscordClient.Dispatch.cs
index 922fedae98..01d3283701 100644
--- a/DisCatSharp/Clients/DiscordClient.Dispatch.cs
+++ b/DisCatSharp/Clients/DiscordClient.Dispatch.cs
@@ -23,11 +23,11 @@
 namespace DisCatSharp;
 
 /// <summary>
-/// Represents a discord Logger.ent.L
+/// A Discord API wrapper.
 /// </summary>
 public sealed partial class DiscordClient
 {
-	#region Private Fields
+#region Private Fields
 
 	private string _resumeGatewayUrl;
 	private string _sessionId;
@@ -76,9 +76,9 @@ internal TimeoutHandler(DiscordMember mbr, DiscordGuild guild, DateTime? too, Da
 		}
 	}
 
-	#endregion
+#endregion
 
-	#region Dispatch Handler
+#region Dispatch Handler
 
 	/// <summary>
 	/// Handles the dispatch payloads.
@@ -95,11 +95,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 		if ((this.Configuration?.EnableLibraryDeveloperMode ?? false) || (this.Configuration?.EnablePayloadReceivedEvent ?? false))
 			await this._payloadReceived.InvokeAsync(this, new(this.ServiceProvider)
 			{
-				EventName = payload.EventName,
-				PayloadObject = dat
+				EventName = payload.EventName, PayloadObject = dat
 			}).ConfigureAwait(false);
 
-
 #region Default objects
 
 		var payloadString = dat.ToString();
@@ -120,11 +118,12 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 		DiscordEntitlement ent = default;
 		JToken rawMbr = default;
 		var rawRefMsg = dat["referenced_message"]; // TODO: Can we remove this?
-		#endregion
+
+#endregion
 
 		switch (payload.EventName.ToLowerInvariant())
 		{
-			#region Gateway Status
+#region Gateway Status
 
 			case "ready":
 				var glds = (JArray)dat["guilds"]!;
@@ -135,9 +134,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnResumedAsync().ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Channel
+#region Channel
 
 			case "channel_create":
 				chn = DiscordJson.DeserializeObject<DiscordChannel>(payloadString, this);
@@ -170,9 +169,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				// It's fired incorrectly.
 				break;
 
-			#endregion
+#endregion
 
-			#region Guild
+#region Guild
 
 			case "guild_create":
 				await this.OnGuildCreateEventAsync(dat.ToDiscordObject<DiscordGuild>(), (JArray)dat["members"]!, dat["presences"]!.ToDiscordObject<IEnumerable<DiscordPresence>>()).ConfigureAwait(false);
@@ -218,9 +217,11 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 
 				await this.OnGuildIntegrationsUpdateEventAsync(this.GuildsInternal[gid]).ConfigureAwait(false);
 				break;
-			#endregion
 
-			#region Guild Automod
+#endregion
+
+#region Guild Automod
+
 			case "auto_moderation_rule_create":
 				await this.OnAutomodRuleCreated(dat.ToDiscordObject<AutomodRule>()).ConfigureAwait(false);
 				break;
@@ -234,9 +235,10 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				gid = (ulong)dat["guild_id"]!;
 				await this.OnAutomodActionExecuted(this.GuildsInternal[gid], dat).ConfigureAwait(false);
 				break;
-			#endregion
 
-			#region Guild Ban
+#endregion
+
+#region Guild Ban
 
 			case "guild_ban_add":
 				usr = DiscordJson.DeserializeObject<TransportUser>(dat["user"]!.ToString(), this);
@@ -250,9 +252,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnGuildBanRemoveEventAsync(usr, this.GuildsInternal[gid]).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Guild Event
+#region Guild Event
 
 			case "guild_scheduled_event_create":
 				gse = DiscordJson.DeserializeObject<DiscordScheduledEvent>(payloadString, this);
@@ -284,9 +286,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnGuildScheduledEventUserRemovedEventAsync((ulong)dat["guild_scheduled_event_id"]!, uid, this.GuildsInternal[gid]).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Guild Integration
+#region Guild Integration
 
 			case "integration_create":
 				gid = (ulong)dat["guild_id"]!;
@@ -319,9 +321,10 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 
 				await this.OnGuildIntegrationDeleteEventAsync(this.GuildsInternal[gid], (ulong)dat["id"], (ulong?)dat["application_id"]).ConfigureAwait(false);
 				break;
-			#endregion
 
-			#region Guild Member
+#endregion
+
+#region Guild Member
 
 			case "guild_member_add":
 				gid = (ulong)dat["guild_id"]!;
@@ -352,9 +355,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnGuildMembersChunkEventAsync(dat).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Guild Role
+#region Guild Role
 
 			case "guild_role_create":
 				gid = (ulong)dat["guild_id"]!;
@@ -371,9 +374,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnGuildRoleDeleteEventAsync((ulong)dat["role_id"]!, this.GuildsInternal[gid]).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Invite
+#region Invite
 
 			case "invite_create":
 				gid = (ulong)dat["guild_id"]!;
@@ -387,9 +390,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnInviteDeleteEventAsync(cid, gid, dat).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Message
+#region Message
 
 			case "message_ack":
 				cid = (ulong)dat["channel_id"]!;
@@ -409,8 +412,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 						refUsr = DiscordJson.DeserializeObject<TransportUser>(rawRefMsg.SelectToken("author")!.ToString(), this);
 
 					if (rawRefMsg.SelectToken("member") != null)
-						refMbr = DiscordJson.DeserializeObject<TransportMember>(json: rawRefMsg.SelectToken("member")!.ToString(), this);
+						refMbr = DiscordJson.DeserializeObject<TransportMember>(rawRefMsg.SelectToken("member")!.ToString(), this);
 				}
+
 				await this.OnMessageCreateEventAsync(dat.ToDiscordObject<DiscordMessage>(), dat["author"].ToObject<TransportUser>(), mbr, refUsr, refMbr).ConfigureAwait(false);
 				break;
 
@@ -426,7 +430,7 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 						refUsr = DiscordJson.DeserializeObject<TransportUser>(rawRefMsg.SelectToken("author")!.ToString(), this);
 
 					if (rawRefMsg.SelectToken("member") != null)
-						refMbr = DiscordJson.DeserializeObject<TransportMember>(json: rawRefMsg.SelectToken("member")!.ToString(), this);
+						refMbr = DiscordJson.DeserializeObject<TransportMember>(rawRefMsg.SelectToken("member")!.ToString(), this);
 				}
 
 				await this.OnMessageUpdateEventAsync(DiscordJson.DeserializeObject<DiscordMessage>(payloadString, this), dat["author"] != null ? DiscordJson.DeserializeObject<TransportUser>(dat["author"]!.ToString(), this) : null, mbr!, refUsr!, refMbr!).ConfigureAwait(false);
@@ -441,9 +445,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnMessageBulkDeleteEventAsync(dat["ids"]!.ToObject<ulong[]>()!, (ulong)dat["channel_id"]!, (ulong?)dat["guild_id"]).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Message Reaction
+#region Message Reaction
 
 			case "message_reaction_add":
 				rawMbr = dat["member"]!;
@@ -466,9 +470,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnMessageReactionRemoveEmojiAsync((ulong)dat["message_id"]!, (ulong)dat["channel_id"]!, (ulong)dat["guild_id"]!, DiscordJson.DeserializeObject<DiscordEmoji>(dat["emoji"]!.ToString(), this)).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Stage Instance
+#region Stage Instance
 
 			case "stage_instance_create":
 				stg = DiscordJson.DeserializeObject<DiscordStageInstance>(payloadString, this);
@@ -485,9 +489,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnStageInstanceDeleteEventAsync(stg).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Thread
+#region Thread
 
 			case "thread_create":
 				trd = DiscordJson.DeserializeObject<DiscordThreadChannel>(payloadString, this);
@@ -522,17 +526,19 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnThreadMembersUpdateEventAsync(this.GuildsInternal[gid], (ulong)dat["id"]!, (JArray)dat["added_members"]!, (JArray)dat["removed_member_ids"]!, (int)dat["member_count"]!).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
+
+#region Activities
 
-			#region Activities
 			case "embedded_activity_update":
 				gid = (ulong)dat["guild_id"]!;
 				cid = (ulong)dat["channel_id"]!;
 				await this.OnEmbeddedActivityUpdateAsync((JObject)dat["embedded_activity"]!, this.GuildsInternal[gid], cid, (JArray)dat["users"]!, (ulong)dat["embedded_activity"]["application_id"]!).ConfigureAwait(false);
 				break;
-			#endregion
 
-			#region User/Presence Update
+#endregion
+
+#region User/Presence Update
 
 			case "presence_update":
 				await this.OnPresenceUpdateEventAsync(dat, (JObject)dat["user"]!).ConfigureAwait(false);
@@ -548,9 +554,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnUserUpdateEventAsync(usr).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Voice
+#region Voice
 
 			case "voice_state_update":
 				await this.OnVoiceStateUpdateEventAsync(dat).ConfigureAwait(false);
@@ -561,9 +567,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnVoiceServerUpdateEventAsync((string)dat["endpoint"]!, (string)dat["token"]!, this.GuildsInternal[gid]).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Interaction/Integration/Application
+#region Interaction/Integration/Application
 
 			case "interaction_create":
 				rawMbr = dat["member"]!;
@@ -615,9 +621,9 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				await this.OnApplicationCommandPermissionsUpdateAsync(pms, (ulong)dat["id"]!, gid, aid).ConfigureAwait(false);
 				break;
 
-			#endregion
+#endregion
 
-			#region Misc
+#region Misc
 
 			case "gift_code_update": //Not supposed to be dispatched to bots
 				break;
@@ -661,15 +667,15 @@ internal async Task HandleDispatchAsync(GatewayPayload payload)
 				this.Logger.LogWarning(LoggerEvents.WebSocketReceive, "Unknown event: {name}\npayload: {payload}", payload.EventName, dat.ToString(Formatting.Indented));
 				break;
 
-			#endregion
+#endregion
 		}
 	}
 
-	#endregion
+#endregion
 
-	#region Events
+#region Events
 
-	#region Gateway
+#region Gateway
 
 	/// <summary>
 	/// Handles the ready event.
@@ -725,7 +731,6 @@ internal async Task OnReadyEventAsync(ReadyPayload ready, JArray rawGuilds)
 				guild.MembersInternal = new();
 
 			if (rawMembers != null)
-			{
 				foreach (var xj in rawMembers)
 				{
 					var xtm = xj.ToObject<TransportMember>();
@@ -749,9 +754,11 @@ internal async Task OnReadyEventAsync(ReadyPayload ready, JArray rawGuilds)
 						return old;
 					});
 
-					guild.MembersInternal[xtm.User.Id] = new(xtm) { Discord = this, GuildId = guild.Id };
+					guild.MembersInternal[xtm.User.Id] = new(xtm)
+					{
+						Discord = this, GuildId = guild.Id
+					};
 				}
-			}
 
 			guild.EmojisInternal ??= new();
 
@@ -798,9 +805,9 @@ internal Task OnResumedAsync()
 		return this._resumed.InvokeAsync(this, new(this.ServiceProvider));
 	}
 
-	#endregion
+#endregion
 
-	#region Channel
+#region Channel
 
 	/// <summary>
 	/// Handles the channel create event.
@@ -817,7 +824,10 @@ internal async Task OnChannelCreateEventAsync(DiscordChannel channel)
                 await this.RefreshChannelsAsync(channel.Guild.Id);
             }*/
 
-		await this._channelCreated.InvokeAsync(this, new(this.ServiceProvider) { Channel = channel, Guild = channel.Guild }).ConfigureAwait(false);
+		await this._channelCreated.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			Channel = channel, Guild = channel.Guild
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -856,7 +866,7 @@ internal async Task OnChannelUpdateEventAsync(DiscordChannel channel)
 				PerUserRateLimit = channelNew.PerUserRateLimit,
 				RtcRegionId = channelNew.RtcRegionId,
 				QualityMode = channelNew.QualityMode,
-				DefaultAutoArchiveDuration = channelNew.DefaultAutoArchiveDuration,
+				DefaultAutoArchiveDuration = channelNew.DefaultAutoArchiveDuration
 			};
 
 			channelNew.Bitrate = channel.Bitrate;
@@ -878,7 +888,6 @@ internal async Task OnChannelUpdateEventAsync(DiscordChannel channel)
 
 			channelNew.PermissionOverwritesInternal.AddRange(channel.PermissionOverwritesInternal);
 
-
 			if (channel.Type == ChannelType.Forum)
 			{
 				channelOld.PostCreateUserRateLimit = channelNew.PostCreateUserRateLimit;
@@ -912,25 +921,25 @@ internal async Task OnChannelUpdateEventAsync(DiscordChannel channel)
 				channelNew.DefaultReactionEmoji = null;
 				channelNew.DefaultSortOrder = null;
 			}
+
 			channelOld.Initialize(this);
 			channelNew.Initialize(this);
 
 			if (this.Configuration.AutoRefreshChannelCache && gld != null)
-			{
 				await this.RefreshChannelsAsync(channel.Guild.Id).ConfigureAwait(false);
-			}
 		}
 		else if (gld != null)
 		{
 			gld.ChannelsInternal[channel.Id] = channel;
 
 			if (this.Configuration.AutoRefreshChannelCache)
-			{
 				await this.RefreshChannelsAsync(channel.Guild.Id).ConfigureAwait(false);
-			}
 		}
 
-		await this._channelUpdated.InvokeAsync(this, new(this.ServiceProvider) { ChannelAfter = channelNew, Guild = gld, ChannelBefore = channelOld }).ConfigureAwait(false);
+		await this._channelUpdated.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			ChannelAfter = channelNew, Guild = gld, ChannelBefore = channelOld
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -949,7 +958,10 @@ internal async Task OnChannelDeleteEventAsync(DiscordChannel channel)
 		{
 			var dmChannel = channel as DiscordDmChannel;
 
-			await this._dmChannelDeleted.InvokeAsync(this, new(this.ServiceProvider) { Channel = dmChannel }).ConfigureAwait(false);
+			await this._dmChannelDeleted.InvokeAsync(this, new(this.ServiceProvider)
+			{
+				Channel = dmChannel
+			}).ConfigureAwait(false);
 		}
 		else
 		{
@@ -958,11 +970,12 @@ internal async Task OnChannelDeleteEventAsync(DiscordChannel channel)
 			if (gld.ChannelsInternal.TryRemove(channel.Id, out var cachedChannel)) channel = cachedChannel;
 
 			if (this.Configuration.AutoRefreshChannelCache)
-			{
 				await this.RefreshChannelsAsync(channel.Guild.Id).ConfigureAwait(false);
-			}
 
-			await this._channelDeleted.InvokeAsync(this, new(this.ServiceProvider) { Channel = channel, Guild = gld }).ConfigureAwait(false);
+			await this._channelDeleted.InvokeAsync(this, new(this.ServiceProvider)
+			{
+				Channel = channel, Guild = gld
+			}).ConfigureAwait(false);
 		}
 	}
 
@@ -995,9 +1008,7 @@ internal async Task OnChannelPinsUpdateAsync(ulong? guildId, ulong channelId, Da
 
 		var ea = new ChannelPinsUpdateEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			Channel = channel,
-			LastPinTimestamp = lastPinTimestamp
+			Guild = guild, Channel = channel, LastPinTimestamp = lastPinTimestamp
 		};
 		await this._channelPinsUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
@@ -1015,16 +1026,14 @@ internal async Task OnVoiceChannelStatusUpdateAsync(ulong guildId, ulong channel
 
 		var ea = new VoiceChannelStatusUpdateEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			Channel = channel,
-			Status = status
+			Guild = guild, Channel = channel, Status = status
 		};
 		await this._voiceChannelStatusUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Guild
+#region Guild
 
 	/// <summary>
 	/// Handles the guild create event.
@@ -1035,20 +1044,16 @@ internal async Task OnVoiceChannelStatusUpdateAsync(ulong guildId, ulong channel
 	internal async Task OnGuildCreateEventAsync(DiscordGuild guild, JArray rawMembers, IEnumerable<DiscordPresence> presences)
 	{
 		if (presences != null)
-		{
 			foreach (var xp in presences)
 			{
 				xp.Discord = this;
 				xp.GuildId = guild.Id;
 				xp.Activity = new(xp.RawActivity);
 				if (xp.RawActivities != null)
-				{
 					xp.InternalActivities = xp.RawActivities
 						.Select(x => new DiscordActivity(x)).ToArray();
-				}
 				this.PresencesInternal[xp.InternalUser.Id] = xp;
 			}
-		}
 
 		var exists = this.GuildsInternal.TryGetValue(guild.Id, out var foundGuild);
 
@@ -1095,11 +1100,13 @@ internal async Task OnGuildCreateEventAsync(DiscordGuild guild, JArray rawMember
 			xc.GuildId = guild.Id;
 			xc.Initialize(this);
 		}
+
 		foreach (var xt in guild.ThreadsInternal.Values)
 		{
 			xt.GuildId = guild.Id;
 			xt.Discord = this;
 		}
+
 		foreach (var xe in guild.EmojisInternal.Values)
 			xe.Discord = this;
 		foreach (var xs in guild.StickersInternal.Values)
@@ -1111,11 +1118,13 @@ internal async Task OnGuildCreateEventAsync(DiscordGuild guild, JArray rawMember
 			xsi.Discord = this;
 			xsi.GuildId = guild.Id;
 		}
+
 		foreach (var xr in guild.RolesInternal.Values)
 		{
 			xr.Discord = this;
 			xr.GuildId = guild.Id;
 		}
+
 		foreach (var xse in guild.ScheduledEventsInternal.Values)
 		{
 			xse.Discord = this;
@@ -1129,9 +1138,15 @@ internal async Task OnGuildCreateEventAsync(DiscordGuild guild, JArray rawMember
 		Volatile.Write(ref this._guildDownloadCompleted, dcompl);
 
 		if (exists)
-			await this._guildAvailable.InvokeAsync(this, new(this.ServiceProvider) { Guild = guild }).ConfigureAwait(false);
+			await this._guildAvailable.InvokeAsync(this, new(this.ServiceProvider)
+			{
+				Guild = guild
+			}).ConfigureAwait(false);
 		else
-			await this._guildCreated.InvokeAsync(this, new(this.ServiceProvider) { Guild = guild }).ConfigureAwait(false);
+			await this._guildCreated.InvokeAsync(this, new(this.ServiceProvider)
+			{
+				Guild = guild
+			}).ConfigureAwait(false);
 
 		if (dcompl && !old)
 			await this._guildDownloadCompletedEv.InvokeAsync(this, new(this.Guilds, this.ServiceProvider)).ConfigureAwait(false);
@@ -1239,11 +1254,13 @@ internal async Task OnGuildUpdateEventAsync(DiscordGuild guild, JArray rawMember
 			xc.GuildId = guild.Id;
 			xc.Initialize(this);
 		}
+
 		foreach (var xc in guild.ThreadsInternal.Values)
 		{
 			xc.GuildId = guild.Id;
 			xc.Discord = this;
 		}
+
 		foreach (var xe in guild.EmojisInternal.Values)
 			xe.Discord = this;
 		foreach (var xs in guild.StickersInternal.Values)
@@ -1255,11 +1272,13 @@ internal async Task OnGuildUpdateEventAsync(DiscordGuild guild, JArray rawMember
 			xr.Discord = this;
 			xr.GuildId = guild.Id;
 		}
+
 		foreach (var xsi in guild.StageInstancesInternal.Values)
 		{
 			xsi.Discord = this;
 			xsi.GuildId = guild.Id;
 		}
+
 		foreach (var xse in guild.ScheduledEventsInternal.Values)
 		{
 			xse.Discord = this;
@@ -1268,7 +1287,10 @@ internal async Task OnGuildUpdateEventAsync(DiscordGuild guild, JArray rawMember
 				xse.Creator.Discord = this;
 		}
 
-		await this._guildUpdated.InvokeAsync(this, new(this.ServiceProvider) { GuildBefore = oldGuild, GuildAfter = guild }).ConfigureAwait(false);
+		await this._guildUpdated.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			GuildBefore = oldGuild, GuildAfter = guild
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -1284,14 +1306,20 @@ internal async Task OnGuildDeleteEventAsync(DiscordGuild guild)
 
 			gld.IsUnavailable = true;
 
-			await this._guildUnavailable.InvokeAsync(this, new(this.ServiceProvider) { Guild = guild, Unavailable = true }).ConfigureAwait(false);
+			await this._guildUnavailable.InvokeAsync(this, new(this.ServiceProvider)
+			{
+				Guild = guild, Unavailable = true
+			}).ConfigureAwait(false);
 		}
 		else
 		{
 			if (!this.GuildsInternal.TryRemove(guild.Id, out var gld))
 				return;
 
-			await this._guildDeleted.InvokeAsync(this, new(this.ServiceProvider) { Guild = gld }).ConfigureAwait(false);
+			await this._guildDeleted.InvokeAsync(this, new(this.ServiceProvider)
+			{
+				Guild = gld
+			}).ConfigureAwait(false);
 		}
 	}
 
@@ -1304,7 +1332,7 @@ internal async Task OnGuildAuditLogEntryCreateEventAsync(DiscordGuild guild, JOb
 	{
 		try
 		{
-			var auditLogAction = DiscordJson.ToDiscordObject<AuditLogAction>(auditLogCreateEntry);
+			/*var auditLogAction = DiscordJson.ToDiscordObject<AuditLogAction>(auditLogCreateEntry);
 			List<AuditLog> workaroundAuditLogEntryList = new()
 			{
 				new()
@@ -1314,11 +1342,14 @@ internal async Task OnGuildAuditLogEntryCreateEventAsync(DiscordGuild guild, JOb
 						auditLogAction
 					}
 				}
-			};
+			};*/
 
-			var dataList = await guild.ProcessAuditLog(workaroundAuditLogEntryList).ConfigureAwait(false);
+			//var dataList = await guild.ProcessAuditLog(workaroundAuditLogEntryList).ConfigureAwait(false);
 
-			await this._guildAuditLogEntryCreated.InvokeAsync(this, new(this.ServiceProvider) { Guild = guild, AuditLogEntry = dataList[0] }).ConfigureAwait(false);
+			await this._guildAuditLogEntryCreated.InvokeAsync(this, new(this.ServiceProvider)
+			{
+				Guild = guild, AuditLogEntry = null
+			}).ConfigureAwait(false);
 		}
 		catch (Exception)
 		{ }
@@ -1333,7 +1364,12 @@ internal async Task OnGuildAuditLogEntryCreateEventAsync(DiscordGuild guild, JOb
 	/// <param name="presences">The presences.</param>
 	internal async Task OnGuildSyncEventAsync(DiscordGuild guild, bool isLarge, JArray rawMembers, IEnumerable<DiscordPresence> presences)
 	{
-		presences = presences.Select(xp => { xp.Discord = this; xp.Activity = new(xp.RawActivity); return xp; });
+		presences = presences.Select(xp =>
+		{
+			xp.Discord = this;
+			xp.Activity = new(xp.RawActivity);
+			return xp;
+		});
 		foreach (var xp in presences)
 			this.PresencesInternal[xp.InternalUser.Id] = xp;
 
@@ -1342,7 +1378,10 @@ internal async Task OnGuildSyncEventAsync(DiscordGuild guild, bool isLarge, JArr
 
 		this.UpdateCachedGuild(guild, rawMembers);
 
-		await this._guildAvailable.InvokeAsync(this, new(this.ServiceProvider) { Guild = guild }).ConfigureAwait(false);
+		await this._guildAvailable.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			Guild = guild
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -1363,9 +1402,7 @@ internal async Task OnGuildEmojisUpdateEventAsync(DiscordGuild guild, IEnumerabl
 
 		var ea = new GuildEmojisUpdateEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			EmojisAfter = guild.Emojis,
-			EmojisBefore = new ReadOnlyConcurrentDictionary<ulong, DiscordEmoji>(oldEmojis)
+			Guild = guild, EmojisAfter = guild.Emojis, EmojisBefore = new ReadOnlyConcurrentDictionary<ulong, DiscordEmoji>(oldEmojis)
 		};
 		await this._guildEmojisUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
@@ -1388,6 +1425,7 @@ internal async Task OnStickersUpdatedAsync(IEnumerable<DiscordSticker> newSticke
 				nst.User.Discord = this;
 				this.UserCache.AddOrUpdate(nst.User.Id, nst.User, (old, @new) => @new);
 			}
+
 			nst.Discord = this;
 
 			guild.StickersInternal[nst.Id] = nst;
@@ -1395,9 +1433,7 @@ internal async Task OnStickersUpdatedAsync(IEnumerable<DiscordSticker> newSticke
 
 		var sea = new GuildStickersUpdateEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			StickersBefore = oldStickers,
-			StickersAfter = guild.Stickers
+			Guild = guild, StickersBefore = oldStickers, StickersAfter = guild.Stickers
 		};
 
 		await this._guildStickersUpdated.InvokeAsync(this, sea).ConfigureAwait(false);
@@ -1459,7 +1495,7 @@ internal async Task OnAutomodActionExecuted(DiscordGuild guild, JObject rawPaylo
 		var channelId = rawPayload.TryGetValue("channel_id", out var value) ? (ulong?)value : null;
 		var messageId = rawPayload.TryGetValue("message_id", out var value1) ? (ulong?)value1 : null;
 		var alertMessageId = rawPayload.TryGetValue("alert_system_message_id", out var value2) ? (ulong?)value2 : null;
-		var content = rawPayload.TryGetValue("content", out var value3) ?(string?)value3 : null;
+		var content = rawPayload.TryGetValue("content", out var value3) ? (string?)value3 : null;
 		var matchedKeyword = rawPayload.TryGetValue("matched_keyword", out var value4) ? (string?)value4 : null;
 		var matchedContent = rawPayload.TryGetValue("matched_content", out var value5) ? (string?)value5 : null;
 
@@ -1481,9 +1517,9 @@ internal async Task OnAutomodActionExecuted(DiscordGuild guild, JObject rawPaylo
 		await this._automodActionExecuted.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Guild Ban
+#region Guild Ban
 
 	/// <summary>
 	/// Handles the guild ban add event.
@@ -1492,7 +1528,10 @@ internal async Task OnAutomodActionExecuted(DiscordGuild guild, JObject rawPaylo
 	/// <param name="guild">The guild.</param>
 	internal async Task OnGuildBanAddEventAsync(TransportUser user, DiscordGuild guild)
 	{
-		var usr = new DiscordUser(user) { Discord = this };
+		var usr = new DiscordUser(user)
+		{
+			Discord = this
+		};
 		usr = this.UserCache.AddOrUpdate(user.Id, usr, (id, old) =>
 		{
 			old.Username = usr.Username;
@@ -1503,11 +1542,13 @@ internal async Task OnGuildBanAddEventAsync(TransportUser user, DiscordGuild gui
 		});
 
 		if (!guild.Members.TryGetValue(user.Id, out var mbr))
-			mbr = new(usr) { Discord = this, GuildId = guild.Id };
+			mbr = new(usr)
+			{
+				Discord = this, GuildId = guild.Id
+			};
 		var ea = new GuildBanAddEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			Member = mbr
+			Guild = guild, Member = mbr
 		};
 		await this._guildBanAdded.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
@@ -1519,7 +1560,10 @@ internal async Task OnGuildBanAddEventAsync(TransportUser user, DiscordGuild gui
 	/// <param name="guild">The guild.</param>
 	internal async Task OnGuildBanRemoveEventAsync(TransportUser user, DiscordGuild guild)
 	{
-		var usr = new DiscordUser(user) { Discord = this };
+		var usr = new DiscordUser(user)
+		{
+			Discord = this
+		};
 		usr = this.UserCache.AddOrUpdate(user.Id, usr, (id, old) =>
 		{
 			old.Username = usr.Username;
@@ -1530,18 +1574,20 @@ internal async Task OnGuildBanRemoveEventAsync(TransportUser user, DiscordGuild
 		});
 
 		if (!guild.Members.TryGetValue(user.Id, out var mbr))
-			mbr = new(usr) { Discord = this, GuildId = guild.Id };
+			mbr = new(usr)
+			{
+				Discord = this, GuildId = guild.Id
+			};
 		var ea = new GuildBanRemoveEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			Member = mbr
+			Guild = guild, Member = mbr
 		};
 		await this._guildBanRemoved.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Guild Scheduled Event
+#region Guild Scheduled Event
 
 	/// <summary>
 	/// Handles the scheduled event create event.
@@ -1568,7 +1614,10 @@ internal async Task OnGuildScheduledEventCreateEventAsync(DiscordScheduledEvent
 			});
 		}
 
-		await this._guildScheduledEventCreated.InvokeAsync(this, new(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = scheduledEvent.Guild }).ConfigureAwait(false);
+		await this._guildScheduledEventCreated.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			ScheduledEvent = scheduledEvent, Guild = scheduledEvent.Guild
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -1583,9 +1632,7 @@ internal async Task OnGuildScheduledEventUpdateEventAsync(DiscordScheduledEvent
 
 		DiscordScheduledEvent oldEvent;
 		if (!guild.ScheduledEventsInternal.ContainsKey(scheduledEvent.Id))
-		{
 			oldEvent = null;
-		}
 		else
 		{
 			var ev = guild.ScheduledEventsInternal[scheduledEvent.Id];
@@ -1608,8 +1655,8 @@ internal async Task OnGuildScheduledEventUpdateEventAsync(DiscordScheduledEvent
 				UserCount = ev.UserCount,
 				CoverImageHash = ev.CoverImageHash
 			};
-
 		}
+
 		if (scheduledEvent.Creator != null)
 		{
 			scheduledEvent.Creator.Discord = this;
@@ -1627,18 +1674,27 @@ internal async Task OnGuildScheduledEventUpdateEventAsync(DiscordScheduledEvent
 		if (scheduledEvent.Status == ScheduledEventStatus.Completed)
 		{
 			guild.ScheduledEventsInternal.TryRemove(scheduledEvent.Id, out var deletedEvent);
-			await this._guildScheduledEventDeleted.InvokeAsync(this, new(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = guild, Reason = ScheduledEventStatus.Completed }).ConfigureAwait(false);
+			await this._guildScheduledEventDeleted.InvokeAsync(this, new(this.ServiceProvider)
+			{
+				ScheduledEvent = scheduledEvent, Guild = guild, Reason = ScheduledEventStatus.Completed
+			}).ConfigureAwait(false);
 		}
 		else if (scheduledEvent.Status == ScheduledEventStatus.Canceled)
 		{
 			guild.ScheduledEventsInternal.TryRemove(scheduledEvent.Id, out var deletedEvent);
 			scheduledEvent.Status = ScheduledEventStatus.Canceled;
-			await this._guildScheduledEventDeleted.InvokeAsync(this, new(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = guild, Reason = ScheduledEventStatus.Canceled }).ConfigureAwait(false);
+			await this._guildScheduledEventDeleted.InvokeAsync(this, new(this.ServiceProvider)
+			{
+				ScheduledEvent = scheduledEvent, Guild = guild, Reason = ScheduledEventStatus.Canceled
+			}).ConfigureAwait(false);
 		}
 		else
 		{
 			this.UpdateScheduledEvent(scheduledEvent, guild);
-			await this._guildScheduledEventUpdated.InvokeAsync(this, new(this.ServiceProvider) { ScheduledEventBefore = oldEvent, ScheduledEventAfter = scheduledEvent, Guild = guild }).ConfigureAwait(false);
+			await this._guildScheduledEventUpdated.InvokeAsync(this, new(this.ServiceProvider)
+			{
+				ScheduledEventBefore = oldEvent, ScheduledEventAfter = scheduledEvent, Guild = guild
+			}).ConfigureAwait(false);
 		}
 	}
 
@@ -1668,7 +1724,10 @@ internal async Task OnGuildScheduledEventDeleteEventAsync(DiscordScheduledEvent
 			});
 		}
 
-		await this._guildScheduledEventDeleted.InvokeAsync(this, new(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = scheduledEvent.Guild, Reason = scheduledEvent.Status }).ConfigureAwait(false);
+		await this._guildScheduledEventDeleted.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			ScheduledEvent = scheduledEvent, Guild = scheduledEvent.Guild, Reason = scheduledEvent.Status
+		}).ConfigureAwait(false);
 		guild.ScheduledEventsInternal.TryRemove(scheduledEvent.Id, out var deletedEvent);
 	}
 
@@ -1682,10 +1741,7 @@ internal async Task OnGuildScheduledEventUserAddedEventAsync(ulong guildSchedule
 	{
 		var scheduledEvent = this.InternalGetCachedScheduledEvent(guildScheduledEventId) ?? this.UpdateScheduledEvent(new()
 		{
-			Id = guildScheduledEventId,
-			GuildId = guild.Id,
-			Discord = this,
-			UserCount = 0
+			Id = guildScheduledEventId, GuildId = guild.Id, Discord = this, UserCount = 0
 		}, guild);
 
 		scheduledEvent.UserCount++;
@@ -1697,7 +1753,10 @@ internal async Task OnGuildScheduledEventUserAddedEventAsync(ulong guildSchedule
 		var member = guild.Members.TryGetValue(userId, out var mem) ? mem : guild.GetMemberAsync(userId).Result;
 		member.Discord = this;
 
-		await this._guildScheduledEventUserAdded.InvokeAsync(this, new(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = guild, User = user, Member = member }).ConfigureAwait(false);
+		await this._guildScheduledEventUserAdded.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			ScheduledEvent = scheduledEvent, Guild = guild, User = user, Member = member
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -1710,10 +1769,7 @@ internal async Task OnGuildScheduledEventUserRemovedEventAsync(ulong guildSchedu
 	{
 		var scheduledEvent = this.InternalGetCachedScheduledEvent(guildScheduledEventId) ?? this.UpdateScheduledEvent(new()
 		{
-			Id = guildScheduledEventId,
-			GuildId = guild.Id,
-			Discord = this,
-			UserCount = 0
+			Id = guildScheduledEventId, GuildId = guild.Id, Discord = this, UserCount = 0
 		}, guild);
 
 		scheduledEvent.UserCount = scheduledEvent.UserCount == 0 ? 0 : scheduledEvent.UserCount - 1;
@@ -1725,12 +1781,15 @@ internal async Task OnGuildScheduledEventUserRemovedEventAsync(ulong guildSchedu
 		var member = guild.Members.TryGetValue(userId, out var mem) ? mem : guild.GetMemberAsync(userId).Result;
 		member.Discord = this;
 
-		await this._guildScheduledEventUserRemoved.InvokeAsync(this, new(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = guild, User = user, Member = member }).ConfigureAwait(false);
+		await this._guildScheduledEventUserRemoved.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			ScheduledEvent = scheduledEvent, Guild = guild, User = user, Member = member
+		}).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Guild Integration
+#region Guild Integration
 
 	/// <summary>
 	/// Handles the guild integration create event.
@@ -1741,7 +1800,10 @@ internal async Task OnGuildIntegrationCreateEventAsync(DiscordGuild guild, Disco
 	{
 		integration.Discord = this;
 
-		await this._guildIntegrationCreated.InvokeAsync(this, new(this.ServiceProvider) { Integration = integration, Guild = guild }).ConfigureAwait(false);
+		await this._guildIntegrationCreated.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			Integration = integration, Guild = guild
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -1753,7 +1815,10 @@ internal async Task OnGuildIntegrationUpdateEventAsync(DiscordGuild guild, Disco
 	{
 		integration.Discord = this;
 
-		await this._guildIntegrationUpdated.InvokeAsync(this, new(this.ServiceProvider) { Integration = integration, Guild = guild }).ConfigureAwait(false);
+		await this._guildIntegrationUpdated.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			Integration = integration, Guild = guild
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -1776,11 +1841,14 @@ internal async Task OnGuildIntegrationsUpdateEventAsync(DiscordGuild guild)
 	/// <param name="integrationId">The integration id.</param>
 	/// <param name="applicationId">The optional application id.</param>
 	internal async Task OnGuildIntegrationDeleteEventAsync(DiscordGuild guild, ulong integrationId, ulong? applicationId)
-		=> await this._guildIntegrationDeleted.InvokeAsync(this, new(this.ServiceProvider) { Guild = guild, IntegrationId = integrationId, ApplicationId = applicationId }).ConfigureAwait(false);
+		=> await this._guildIntegrationDeleted.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			Guild = guild, IntegrationId = integrationId, ApplicationId = applicationId
+		}).ConfigureAwait(false);
 
-	#endregion
+#endregion
 
-	#region Guild Member
+#region Guild Member
 
 	/// <summary>
 	/// Handles the guild member add event.
@@ -1789,7 +1857,10 @@ internal async Task OnGuildIntegrationDeleteEventAsync(DiscordGuild guild, ulong
 	/// <param name="guild">The guild.</param>
 	internal async Task OnGuildMemberAddEventAsync(TransportMember member, DiscordGuild guild)
 	{
-		var usr = new DiscordUser(member.User) { Discord = this };
+		var usr = new DiscordUser(member.User)
+		{
+			Discord = this
+		};
 		usr = this.UserCache.AddOrUpdate(member.User.Id, usr, (id, old) =>
 		{
 			old.Username = usr.Username;
@@ -1807,8 +1878,7 @@ internal async Task OnGuildMemberAddEventAsync(TransportMember member, DiscordGu
 
 		var mbr = new DiscordMember(member)
 		{
-			Discord = this,
-			GuildId = guild.Id
+			Discord = this, GuildId = guild.Id
 		};
 
 		guild.MembersInternal[mbr.Id] = mbr;
@@ -1816,8 +1886,7 @@ internal async Task OnGuildMemberAddEventAsync(TransportMember member, DiscordGu
 
 		var ea = new GuildMemberAddEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			Member = mbr
+			Guild = guild, Member = mbr
 		};
 		await this._guildMemberAdded.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
@@ -1832,15 +1901,17 @@ internal async Task OnGuildMemberRemoveEventAsync(TransportUser user, DiscordGui
 		var usr = new DiscordUser(user);
 
 		if (!guild.MembersInternal.TryRemove(user.Id, out var mbr))
-			mbr = new(usr) { Discord = this, GuildId = guild.Id };
+			mbr = new(usr)
+			{
+				Discord = this, GuildId = guild.Id
+			};
 		guild.MemberCount--;
 
 		_ = this.UserCache.AddOrUpdate(user.Id, usr, (old, @new) => @new);
 
 		var ea = new GuildMemberRemoveEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			Member = mbr
+			Guild = guild, Member = mbr
 		};
 		await this._guildMemberRemoved.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
@@ -1855,7 +1926,10 @@ internal async Task OnGuildMemberRemoveEventAsync(TransportUser user, DiscordGui
 	/// <param name="pending">Whether the member is pending.</param>
 	internal async Task OnGuildMemberUpdateEventAsync(TransportMember member, DiscordGuild guild, IEnumerable<ulong> roles, string nick, bool? pending)
 	{
-		var usr = new DiscordUser(member.User) { Discord = this };
+		var usr = new DiscordUser(member.User)
+		{
+			Discord = this
+		};
 		usr = this.UserCache.AddOrUpdate(usr.Id, usr, (id, old) =>
 		{
 			old.Username = usr.Username;
@@ -1872,7 +1946,10 @@ internal async Task OnGuildMemberUpdateEventAsync(TransportMember member, Discor
 		});
 
 		if (!guild.Members.TryGetValue(member.User.Id, out var mbr))
-			mbr = new(usr) { Discord = this, GuildId = guild.Id };
+			mbr = new(usr)
+			{
+				Discord = this, GuildId = guild.Id
+			};
 		var old = mbr;
 
 		var gAvOld = old.GuildAvatarHash;
@@ -1931,7 +2008,6 @@ internal async Task OnGuildMemberUpdateEventAsync(TransportMember member, Discor
 		{
 			Guild = guild,
 			Member = mbr,
-
 			NicknameAfter = mbr.Nickname,
 			RolesAfter = new ReadOnlyCollection<DiscordRole>(new List<DiscordRole>(mbr.Roles)),
 			PendingAfter = mbr.IsPending,
@@ -1939,7 +2015,6 @@ internal async Task OnGuildMemberUpdateEventAsync(TransportMember member, Discor
 			AvatarHashAfter = mbr.AvatarHash,
 			GuildAvatarHashAfter = mbr.GuildAvatarHash,
 			UnusualDmActivityAfter = mbr.UnusualDmActivityUntil,
-
 			NicknameBefore = nickOld,
 			RolesBefore = rolesOld,
 			PendingBefore = pendingOld,
@@ -1951,7 +2026,7 @@ internal async Task OnGuildMemberUpdateEventAsync(TransportMember member, Discor
 		await this._guildMemberUpdated.InvokeAsync(this, eargs).ConfigureAwait(false);
 	}
 
-	/// <summary>
+	/*/// <summary>
 	/// Handles timeout events.
 	/// </summary>
 	/// <param name="state">Internally used as uid for the timer data.</param>
@@ -2055,7 +2130,7 @@ private async void TimeoutTimer(object state)
 		this.Logger.LogTrace("Removing timeout event.");
 		await timer.DisposeAsync().ConfigureAwait(false);
 		this._tempTimers.Remove(tid);
-	}
+	}*/
 
 	/// <summary>
 	/// Handles the guild members chunk event.
@@ -2075,10 +2150,16 @@ internal async Task OnGuildMembersChunkEventAsync(JObject dat)
 
 		foreach (var member in members)
 		{
-			var mbr = new DiscordMember(member) { Discord = this, GuildId = guild.Id };
+			var mbr = new DiscordMember(member)
+			{
+				Discord = this, GuildId = guild.Id
+			};
 
 			if (!this.UserCache.ContainsKey(mbr.Id))
-				this.UserCache[mbr.Id] = new(member.User) { Discord = this };
+				this.UserCache[mbr.Id] = new(member.User)
+				{
+					Discord = this
+				};
 
 			guild.MembersInternal[mbr.Id] = mbr;
 
@@ -2093,7 +2174,7 @@ internal async Task OnGuildMembersChunkEventAsync(JObject dat)
 			Members = new ReadOnlySet<DiscordMember>(mbrs),
 			ChunkIndex = chunkIndex,
 			ChunkCount = chunkCount,
-			Nonce = nonce,
+			Nonce = nonce
 		};
 
 		if (dat["presences"] != null)
@@ -2107,10 +2188,8 @@ internal async Task OnGuildMembersChunkEventAsync(JObject dat)
 				presence.Activity = new(presence.RawActivity);
 
 				if (presence.RawActivities != null)
-				{
 					presence.InternalActivities = presence.RawActivities
 						.Select(x => new DiscordActivity(x)).ToArray();
-				}
 
 				pres.Add(presence);
 			}
@@ -2127,9 +2206,9 @@ internal async Task OnGuildMembersChunkEventAsync(JObject dat)
 		await this._guildMembersChunked.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Guild Role
+#region Guild Role
 
 	/// <summary>
 	/// Handles the guild role create event.
@@ -2145,8 +2224,7 @@ internal async Task OnGuildRoleCreateEventAsync(DiscordRole role, DiscordGuild g
 
 		var ea = new GuildRoleCreateEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			Role = role
+			Guild = guild, Role = role
 		};
 		await this._guildRoleCreated.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
@@ -2190,9 +2268,7 @@ internal async Task OnGuildRoleUpdateEventAsync(DiscordRole role, DiscordGuild g
 
 		var ea = new GuildRoleUpdateEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			RoleAfter = newRole,
-			RoleBefore = oldRole
+			Guild = guild, RoleAfter = newRole, RoleBefore = oldRole
 		};
 		await this._guildRoleUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
@@ -2209,15 +2285,14 @@ internal async Task OnGuildRoleDeleteEventAsync(ulong roleId, DiscordGuild guild
 
 		var ea = new GuildRoleDeleteEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			Role = role
+			Guild = guild, Role = role
 		};
 		await this._guildRoleDeleted.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Invite
+#region Invite
 
 	/// <summary>
 	/// Handles the invite create event.
@@ -2242,9 +2317,7 @@ internal async Task OnInviteCreateEventAsync(ulong channelId, ulong guildId, Dis
 
 		var ea = new InviteCreateEventArgs(this.ServiceProvider)
 		{
-			Channel = channel,
-			Guild = guild,
-			Invite = invite
+			Channel = channel, Guild = guild, Invite = invite
 		};
 		await this._inviteCreated.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
@@ -2270,16 +2343,14 @@ internal async Task OnInviteDeleteEventAsync(ulong channelId, ulong guildId, JTo
 
 		var ea = new InviteDeleteEventArgs(this.ServiceProvider)
 		{
-			Channel = channel,
-			Guild = guild,
-			Invite = invite
+			Channel = channel, Guild = guild, Invite = invite
 		};
 		await this._inviteDeleted.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Message
+#region Message
 
 	/// <summary>
 	/// Handles the message acknowledge event.
@@ -2289,16 +2360,15 @@ internal async Task OnInviteDeleteEventAsync(ulong channelId, ulong guildId, JTo
 	internal async Task OnMessageAckEventAsync(DiscordChannel chn, ulong messageId)
 	{
 		if (this.MessageCache == null || !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == chn.Id, out var msg))
-		{
 			msg = new()
 			{
-				Id = messageId,
-				ChannelId = chn.Id,
-				Discord = this,
+				Id = messageId, ChannelId = chn.Id, Discord = this
 			};
-		}
 
-		await this._messageAcknowledged.InvokeAsync(this, new(this.ServiceProvider) { Message = msg }).ConfigureAwait(false);
+		await this._messageAcknowledged.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			Message = msg
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -2330,11 +2400,7 @@ internal async Task OnMessageCreateEventAsync(DiscordMessage message, TransportU
 
 		var ea = new MessageCreateEventArgs(this.ServiceProvider)
 		{
-			Message = message,
-
-			MentionedUsers = new ReadOnlyCollection<DiscordUser>(message.MentionedUsersInternal),
-			MentionedRoles = message.MentionedRolesInternal != null ? new ReadOnlyCollection<DiscordRole>(message.MentionedRolesInternal) : null,
-			MentionedChannels = message.MentionedChannelsInternal != null ? new ReadOnlyCollection<DiscordChannel>(message.MentionedChannelsInternal) : null
+			Message = message, MentionedUsers = new ReadOnlyCollection<DiscordUser>(message.MentionedUsersInternal), MentionedRoles = message.MentionedRolesInternal != null ? new ReadOnlyCollection<DiscordRole>(message.MentionedRolesInternal) : null, MentionedChannels = message.MentionedChannelsInternal != null ? new ReadOnlyCollection<DiscordChannel>(message.MentionedChannelsInternal) : null
 		};
 		await this._messageCreated.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
@@ -2356,8 +2422,8 @@ internal async Task OnMessageUpdateEventAsync(DiscordMessage message, TransportU
 
 		DiscordMessage oldmsg = null;
 		if (this.Configuration.MessageCacheSize == 0
-			|| this.MessageCache == null
-			|| !this.MessageCache.TryGet(xm => xm.Id == eventMessage.Id && xm.ChannelId == eventMessage.ChannelId, out message))
+		    || this.MessageCache == null
+		    || !this.MessageCache.TryGet(xm => xm.Id == eventMessage.Id && xm.ChannelId == eventMessage.ChannelId, out message))
 		{
 			message = eventMessage;
 			this.PopulateMessageReactionsAndCache(message, author, member);
@@ -2409,27 +2475,20 @@ internal async Task OnMessageDeleteEventAsync(ulong messageId, ulong channelId,
 		var guild = this.InternalGetCachedGuild(guildId);
 
 		if (channel == null
-			|| this.Configuration.MessageCacheSize == 0
-			|| this.MessageCache == null
-			|| !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
-		{
+		    || this.Configuration.MessageCacheSize == 0
+		    || this.MessageCache == null
+		    || !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
 			msg = new()
 			{
-
-				Id = messageId,
-				ChannelId = channelId,
-				Discord = this,
+				Id = messageId, ChannelId = channelId, Discord = this
 			};
-		}
 
 		if (this.Configuration.MessageCacheSize > 0)
 			this.MessageCache?.Remove(xm => xm.Id == msg.Id && xm.ChannelId == channelId);
 
 		var ea = new MessageDeleteEventArgs(this.ServiceProvider)
 		{
-			Channel = channel,
-			Message = msg,
-			Guild = guild
+			Channel = channel, Message = msg, Guild = guild
 		};
 		await this._messageDeleted.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
@@ -2448,17 +2507,13 @@ internal async Task OnMessageBulkDeleteEventAsync(ulong[] messageIds, ulong chan
 		foreach (var messageId in messageIds)
 		{
 			if (channel == null
-				|| this.Configuration.MessageCacheSize == 0
-				|| this.MessageCache == null
-				|| !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
-			{
+			    || this.Configuration.MessageCacheSize == 0
+			    || this.MessageCache == null
+			    || !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
 				msg = new()
 				{
-					Id = messageId,
-					ChannelId = channelId,
-					Discord = this,
+					Id = messageId, ChannelId = channelId, Discord = this
 				};
-			}
 			if (this.Configuration.MessageCacheSize > 0)
 				this.MessageCache?.Remove(xm => xm.Id == msg.Id && xm.ChannelId == channelId);
 			msgs.Add(msg);
@@ -2468,16 +2523,14 @@ internal async Task OnMessageBulkDeleteEventAsync(ulong[] messageIds, ulong chan
 
 		var ea = new MessageBulkDeleteEventArgs(this.ServiceProvider)
 		{
-			Channel = channel,
-			Messages = new ReadOnlyCollection<DiscordMessage>(msgs),
-			Guild = guild
+			Channel = channel, Messages = new ReadOnlyCollection<DiscordMessage>(msgs), Guild = guild
 		};
 		await this._messagesBulkDeleted.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Message Reaction
+#region Message Reaction
 
 	/// <summary>
 	/// Handles the message reaction add event.
@@ -2495,7 +2548,10 @@ internal async Task OnMessageReactionAddAsync(ulong userId, ulong messageId, ulo
 		var guild = this.InternalGetCachedGuild(guildId);
 		emoji.Discord = this;
 
-		var usr = this.UpdateUser(new() { Id = userId, Discord = this }, guildId, guild, mbr);
+		var usr = this.UpdateUser(new()
+		{
+			Id = userId, Discord = this
+		}, guildId, guild, mbr);
 
 		DiscordMessage? msg = null;
 
@@ -2504,22 +2560,15 @@ internal async Task OnMessageReactionAddAsync(ulong userId, ulong messageId, ulo
 
 		msg ??= new()
 		{
-			Id = messageId,
-			ChannelId = channelId,
-			Discord = this,
-			ReactionsInternal = new()
+			Id = messageId, ChannelId = channelId, Discord = this, ReactionsInternal = new()
 		};
 
 		var react = msg.ReactionsInternal.FirstOrDefault(xr => xr.Emoji == emoji);
 		if (react == null)
-		{
 			msg.ReactionsInternal.Add(react = new()
 			{
-				Count = 1,
-				Emoji = emoji,
-				IsMe = this.CurrentUser.Id == userId
+				Count = 1, Emoji = emoji, IsMe = this.CurrentUser.Id == userId
 			});
-		}
 		else
 		{
 			react.Count++;
@@ -2552,21 +2601,24 @@ internal async Task OnMessageReactionRemoveAsync(ulong userId, ulong messageId,
 	{
 		var channel = this.InternalGetCachedChannel(channelId) ?? this.InternalGetCachedThread(channelId) ?? new DiscordChannel()
 		{
-			Type = ChannelType.Unknown,
-			Id = channelId,
-			GuildId = guildId,
-			Discord = this
+			Type = ChannelType.Unknown, Id = channelId, GuildId = guildId, Discord = this
 		};
 
 		emoji.Discord = this;
 
 		if (!this.UserCache.TryGetValue(userId, out var usr))
-			usr = new() { Id = userId, Discord = this };
+			usr = new()
+			{
+				Id = userId, Discord = this
+			};
 
 		if (channel?.Guild != null)
 			usr = channel.Guild.Members.TryGetValue(userId, out var member)
 				? member
-				: new(usr) { Discord = this, GuildId = channel.GuildId.Value };
+				: new(usr)
+				{
+					Discord = this, GuildId = channel.GuildId.Value
+				};
 
 		DiscordMessage? msg = null;
 
@@ -2575,9 +2627,7 @@ internal async Task OnMessageReactionRemoveAsync(ulong userId, ulong messageId,
 
 		msg ??= new()
 		{
-			Id = messageId,
-			ChannelId = channelId,
-			Discord = this
+			Id = messageId, ChannelId = channelId, Discord = this
 		};
 
 		var react = msg.ReactionsInternal?.FirstOrDefault(xr => xr.Emoji == emoji);
@@ -2616,24 +2666,17 @@ internal async Task OnMessageReactionRemoveAllAsync(ulong messageId, ulong chann
 	{
 		var channel = this.InternalGetCachedChannel(channelId) ?? this.InternalGetCachedThread(channelId) ?? new DiscordChannel()
 		{
-			Type = ChannelType.Unknown,
-			Id = channelId,
-			GuildId = guildId,
-			Discord = this
+			Type = ChannelType.Unknown, Id = channelId, GuildId = guildId, Discord = this
 		};
 
 		if (channel == null
-			|| this.Configuration.MessageCacheSize == 0
-			|| this.MessageCache == null
-			|| !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
-		{
+		    || this.Configuration.MessageCacheSize == 0
+		    || this.MessageCache == null
+		    || !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
 			msg = new()
 			{
-				Id = messageId,
-				ChannelId = channelId,
-				Discord = this
+				Id = messageId, ChannelId = channelId, Discord = this
 			};
-		}
 
 		msg.ReactionsInternal?.Clear();
 
@@ -2661,17 +2704,13 @@ internal async Task OnMessageReactionRemoveEmojiAsync(ulong messageId, ulong cha
 		var channel = this.InternalGetCachedChannel(channelId) ?? this.InternalGetCachedThread(channelId);
 
 		if (channel == null
-			|| this.Configuration.MessageCacheSize == 0
-			|| this.MessageCache == null
-			|| !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
-		{
+		    || this.Configuration.MessageCacheSize == 0
+		    || this.MessageCache == null
+		    || !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
 			msg = new()
 			{
-				Id = messageId,
-				ChannelId = channelId,
-				Discord = this
+				Id = messageId, ChannelId = channelId, Discord = this
 			};
-		}
 
 		if (!guild.EmojisInternal.TryGetValue(partialEmoji.Id, out var emoji))
 		{
@@ -2683,18 +2722,15 @@ internal async Task OnMessageReactionRemoveEmojiAsync(ulong messageId, ulong cha
 
 		var ea = new MessageReactionRemoveEmojiEventArgs(this.ServiceProvider)
 		{
-			Channel = channel,
-			Guild = guild,
-			Message = msg,
-			Emoji = emoji
+			Channel = channel, Guild = guild, Message = msg, Emoji = emoji
 		};
 
 		await this._messageReactionRemovedEmoji.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Stage Instance
+#region Stage Instance
 
 	/// <summary>
 	/// Handles the stage instance create event.
@@ -2707,7 +2743,10 @@ internal async Task OnStageInstanceCreateEventAsync(DiscordStageInstance stage)
 		var guild = this.InternalGetCachedGuild(stage.GuildId);
 		guild.StageInstancesInternal[stage.Id] = stage;
 
-		await this._stageInstanceCreated.InvokeAsync(this, new(this.ServiceProvider) { StageInstance = stage, Guild = stage.Guild }).ConfigureAwait(false);
+		await this._stageInstanceCreated.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			StageInstance = stage, Guild = stage.Guild
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -2720,7 +2759,10 @@ internal async Task OnStageInstanceUpdateEventAsync(DiscordStageInstance stage)
 		var guild = this.InternalGetCachedGuild(stage.GuildId);
 		guild.StageInstancesInternal[stage.Id] = stage;
 
-		await this._stageInstanceUpdated.InvokeAsync(this, new(this.ServiceProvider) { StageInstance = stage, Guild = stage.Guild }).ConfigureAwait(false);
+		await this._stageInstanceUpdated.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			StageInstance = stage, Guild = stage.Guild
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -2733,12 +2775,15 @@ internal async Task OnStageInstanceDeleteEventAsync(DiscordStageInstance stage)
 		var guild = this.InternalGetCachedGuild(stage.GuildId);
 		guild.StageInstancesInternal[stage.Id] = stage;
 
-		await this._stageInstanceDeleted.InvokeAsync(this, new(this.ServiceProvider) { StageInstance = stage, Guild = stage.Guild }).ConfigureAwait(false);
+		await this._stageInstanceDeleted.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			StageInstance = stage, Guild = stage.Guild
+		}).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Thread
+#region Thread
 
 	/// <summary>
 	/// Handles the thread create event.
@@ -2749,7 +2794,10 @@ internal async Task OnThreadCreateEventAsync(DiscordThreadChannel thread)
 		thread.Discord = this;
 		this.InternalGetCachedGuild(thread.GuildId).ThreadsInternal.AddOrUpdate(thread.Id, thread, (oldThread, newThread) => newThread);
 
-		await this._threadCreated.InvokeAsync(this, new(this.ServiceProvider) { Thread = thread, Guild = thread.Guild, Parent = thread.Parent }).ConfigureAwait(false);
+		await this._threadCreated.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			Thread = thread, Guild = thread.Guild, Parent = thread.Parent
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -2821,19 +2869,14 @@ internal async Task OnThreadUpdateEventAsync(DiscordThreadChannel thread)
 
 			updateEvent = new(this.ServiceProvider)
 			{
-				ThreadAfter = thread,
-				ThreadBefore = threadOld,
-				Guild = thread.Guild,
-				Parent = thread.Parent
+				ThreadAfter = thread, ThreadBefore = threadOld, Guild = thread.Guild, Parent = thread.Parent
 			};
 		}
 		else
 		{
 			updateEvent = new(this.ServiceProvider)
 			{
-				ThreadAfter = thread,
-				Guild = thread.Guild,
-				Parent = thread.Parent
+				ThreadAfter = thread, Guild = thread.Guild, Parent = thread.Parent
 			};
 			guild.ThreadsInternal[thread.Id] = thread;
 		}
@@ -2856,7 +2899,10 @@ internal async Task OnThreadDeleteEventAsync(DiscordThreadChannel thread)
 		if (gld.ThreadsInternal.TryRemove(thread.Id, out var cachedThread))
 			thread = cachedThread;
 
-		await this._threadDeleted.InvokeAsync(this, new(this.ServiceProvider) { Thread = thread, Guild = thread.Guild, Parent = thread.Parent, Type = thread.Type }).ConfigureAwait(false);
+		await this._threadDeleted.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			Thread = thread, Guild = thread.Guild, Parent = thread.Parent, Type = thread.Type
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -2872,12 +2918,13 @@ internal async Task OnThreadListSyncEventAsync(DiscordGuild guild, IReadOnlyList
 
 		var channels = channelIds.Select(x => guild.GetChannel(x.Value)); //getting channel objects
 		foreach (var chan in channels)
-		{
 			chan.Discord = this;
-		}
 		_ = threads.Select(x => x.Discord = this);
 
-		await this._threadListSynced.InvokeAsync(this, new(this.ServiceProvider) { Guild = guild, Channels = channels.ToList().AsReadOnly(), Threads = threads, Members = members.ToList().AsReadOnly() }).ConfigureAwait(false);
+		await this._threadListSynced.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			Guild = guild, Channels = channels.ToList().AsReadOnly(), Threads = threads, Members = members.ToList().AsReadOnly()
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -2897,8 +2944,10 @@ internal async Task OnThreadMemberUpdateEventAsync(DiscordThreadChannelMember me
 		thread.CurrentMember = member;
 		thread.Guild.ThreadsInternal.AddOrUpdate(member.Id, thread, (oldThread, newThread) => newThread);
 
-
-		await this._threadMemberUpdated.InvokeAsync(this, new(this.ServiceProvider) { ThreadMember = member, Thread = thread }).ConfigureAwait(false);
+		await this._threadMemberUpdated.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			ThreadMember = member, Thread = thread
+		}).ConfigureAwait(false);
 	}
 
 	/// <summary>
@@ -2924,7 +2973,6 @@ internal async Task OnThreadMembersUpdateEventAsync(DiscordGuild guild, ulong th
 		List<ulong> removedMemberIds = new();
 
 		if (membersAdded != null)
-		{
 			foreach (var xj in membersAdded)
 			{
 				var xtm = xj.ToDiscordObject<DiscordThreadChannelMember>();
@@ -2936,16 +2984,16 @@ internal async Task OnThreadMembersUpdateEventAsync(DiscordGuild guild, ulong th
 				if (xtm.Id == this.CurrentUser.Id)
 					thread.CurrentMember = xtm;
 			}
-		}
 
 		var removedMembers = new List<DiscordMember>();
 		if (membersRemoved != null)
-		{
 			foreach (var removedId in membersRemoved)
-			{
-				removedMembers.Add(guild.MembersInternal.TryGetValue((ulong)removedId, out var member) ? member : new() { Id = (ulong)removedId, GuildId = guild.Id, Discord = this });
-			}
-		}
+				removedMembers.Add(guild.MembersInternal.TryGetValue((ulong)removedId, out var member)
+					? member
+					: new()
+					{
+						Id = (ulong)removedId, GuildId = guild.Id, Discord = this
+					});
 
 		if (removedMemberIds.Contains(this.CurrentUser.Id)) //indicates the bot was removed from the thread
 			thread.CurrentMember = null;
@@ -2964,9 +3012,10 @@ internal async Task OnThreadMembersUpdateEventAsync(DiscordGuild guild, ulong th
 		await this._threadMembersUpdated.InvokeAsync(this, threadMembersUpdateArg).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
+
+#region Activities
 
-	#region Activities
 	/// <summary>
 	/// Dispatches the <see cref="EmbeddedActivityUpdated"/> event.
 	/// </summary>
@@ -3026,16 +3075,15 @@ internal async Task OnEmbeddedActivityUpdateAsync(JObject trActivity, DiscordGui
             }
         }*/
 
-	#endregion
+#endregion
 
-	#region User/Presence Update
+#region User/Presence Update
 
 	/// <summary>
 	/// Handles the presence update event.
 	/// </summary>
 	/// <param name="rawPresence">The raw presence.</param>
 	/// <param name="rawUser">The raw user.</param>
-
 	internal async Task OnPresenceUpdateEventAsync(JObject rawPresence, JObject rawUser)
 	{
 		var uid = (ulong)rawUser["id"]!;
@@ -3048,7 +3096,8 @@ internal async Task OnPresenceUpdateEventAsync(JObject rawPresence, JObject rawU
 		}
 		else
 		{
-			presence = DiscordJson.DeserializeObject<DiscordPresence>(rawPresence.ToString(), this); ;
+			presence = DiscordJson.DeserializeObject<DiscordPresence>(rawPresence.ToString(), this);
+			;
 			presence.Discord = this;
 			presence.Activity = new(presence.RawActivity);
 			this.PresencesInternal[presence.InternalUser.Id] = presence;
@@ -3056,9 +3105,7 @@ internal async Task OnPresenceUpdateEventAsync(JObject rawPresence, JObject rawU
 
 		// reuse arrays / avoid linq (this is a hot zone)
 		if (presence.Activities == null || rawPresence["activities"] == null)
-		{
 			presence.InternalActivities = Array.Empty<DiscordActivity>();
-		}
 		else
 		{
 			if (presence.InternalActivities.Length != presence.RawActivities.Length)
@@ -3093,10 +3140,12 @@ internal async Task OnPresenceUpdateEventAsync(JObject rawPresence, JObject rawU
 	/// Handles the user settings update event.
 	/// </summary>
 	/// <param name="user">The transport user.</param>
-
 	internal async Task OnUserSettingsUpdateEventAsync(TransportUser user)
 	{
-		var usr = new DiscordUser(user) { Discord = this };
+		var usr = new DiscordUser(user)
+		{
+			Discord = this
+		};
 
 		var ea = new UserSettingsUpdateEventArgs(this.ServiceProvider)
 		{
@@ -3109,7 +3158,6 @@ internal async Task OnUserSettingsUpdateEventAsync(TransportUser user)
 	/// Handles the user update event.
 	/// </summary>
 	/// <param name="user">The transport user.</param>
-
 	internal async Task OnUserUpdateEventAsync(TransportUser user)
 	{
 		var usrOld = new DiscordUser
@@ -3136,21 +3184,19 @@ internal async Task OnUserUpdateEventAsync(TransportUser user)
 
 		var ea = new UserUpdateEventArgs(this.ServiceProvider)
 		{
-			UserAfter = this.CurrentUser,
-			UserBefore = usrOld
+			UserAfter = this.CurrentUser, UserBefore = usrOld
 		};
 		await this._userUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Voice
+#region Voice
 
 	/// <summary>
 	/// Handles the voice state update event.
 	/// </summary>
 	/// <param name="raw">The raw voice state update object.</param>
-
 	internal async Task OnVoiceStateUpdateEventAsync(JObject raw)
 	{
 		var gid = (ulong)raw["guild_id"];
@@ -3163,9 +3209,7 @@ internal async Task OnVoiceStateUpdateEventAsync(JObject raw)
 		gld.VoiceStatesInternal.TryRemove(uid, out var vstateOld);
 
 		if (vstateNew.Channel != null)
-		{
 			gld.VoiceStatesInternal[vstateNew.UserId] = vstateNew;
-		}
 
 		if (gld.MembersInternal.TryGetValue(uid, out var mbr))
 		{
@@ -3175,7 +3219,10 @@ internal async Task OnVoiceStateUpdateEventAsync(JObject raw)
 		else
 		{
 			var transportMbr = vstateNew.TransportMember;
-			this.UpdateUser(new(transportMbr.User) { Discord = this }, gid, gld, transportMbr);
+			this.UpdateUser(new(transportMbr.User)
+			{
+				Discord = this
+			}, gid, gld, transportMbr);
 		}
 
 		var ea = new VoiceStateUpdateEventArgs(this.ServiceProvider)
@@ -3184,7 +3231,6 @@ internal async Task OnVoiceStateUpdateEventAsync(JObject raw)
 			Channel = vstateNew.Channel,
 			User = vstateNew.User,
 			SessionId = vstateNew.SessionId,
-
 			Before = vstateOld,
 			After = vstateNew
 		};
@@ -3197,28 +3243,24 @@ internal async Task OnVoiceStateUpdateEventAsync(JObject raw)
 	/// <param name="endpoint">The new endpoint.</param>
 	/// <param name="token">The new token.</param>
 	/// <param name="guild">The guild.</param>
-
 	internal async Task OnVoiceServerUpdateEventAsync(string endpoint, string token, DiscordGuild guild)
 	{
 		var ea = new VoiceServerUpdateEventArgs(this.ServiceProvider)
 		{
-			Endpoint = endpoint,
-			VoiceToken = token,
-			Guild = guild
+			Endpoint = endpoint, VoiceToken = token, Guild = guild
 		};
 		await this._voiceServerUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Commands
+#region Commands
 
 	/// <summary>
 	/// Handles the application command create event.
 	/// </summary>
 	/// <param name="cmd">The application command.</param>
 	/// <param name="guildId">The optional guild id.</param>
-
 	internal async Task OnApplicationCommandCreateAsync(DiscordApplicationCommand cmd, ulong? guildId)
 	{
 		cmd.Discord = this;
@@ -3226,18 +3268,14 @@ internal async Task OnApplicationCommandCreateAsync(DiscordApplicationCommand cm
 		var guild = this.InternalGetCachedGuild(guildId);
 
 		if (guild == null && guildId.HasValue)
-		{
 			guild = new()
 			{
-				Id = guildId.Value,
-				Discord = this
+				Id = guildId.Value, Discord = this
 			};
-		}
 
 		var ea = new ApplicationCommandEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			Command = cmd
+			Guild = guild, Command = cmd
 		};
 
 		await this._applicationCommandCreated.InvokeAsync(this, ea).ConfigureAwait(false);
@@ -3248,7 +3286,6 @@ internal async Task OnApplicationCommandCreateAsync(DiscordApplicationCommand cm
 	/// </summary>
 	/// <param name="cmd">The application command.</param>
 	/// <param name="guildId">The optional guild id.</param>
-
 	internal async Task OnApplicationCommandUpdateAsync(DiscordApplicationCommand cmd, ulong? guildId)
 	{
 		cmd.Discord = this;
@@ -3256,18 +3293,14 @@ internal async Task OnApplicationCommandUpdateAsync(DiscordApplicationCommand cm
 		var guild = this.InternalGetCachedGuild(guildId);
 
 		if (guild == null && guildId.HasValue)
-		{
 			guild = new()
 			{
-				Id = guildId.Value,
-				Discord = this
+				Id = guildId.Value, Discord = this
 			};
-		}
 
 		var ea = new ApplicationCommandEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			Command = cmd
+			Guild = guild, Command = cmd
 		};
 
 		await this._applicationCommandUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
@@ -3278,7 +3311,6 @@ internal async Task OnApplicationCommandUpdateAsync(DiscordApplicationCommand cm
 	/// </summary>
 	/// <param name="cmd">The application command.</param>
 	/// <param name="guildId">The optional guild id.</param>
-
 	internal async Task OnApplicationCommandDeleteAsync(DiscordApplicationCommand cmd, ulong? guildId)
 	{
 		cmd.Discord = this;
@@ -3286,18 +3318,14 @@ internal async Task OnApplicationCommandDeleteAsync(DiscordApplicationCommand cm
 		var guild = this.InternalGetCachedGuild(guildId);
 
 		if (guild == null && guildId.HasValue)
-		{
 			guild = new()
 			{
-				Id = guildId.Value,
-				Discord = this
+				Id = guildId.Value, Discord = this
 			};
-		}
 
 		var ea = new ApplicationCommandEventArgs(this.ServiceProvider)
 		{
-			Guild = guild,
-			Command = cmd
+			Guild = guild, Command = cmd
 		};
 
 		await this._applicationCommandDeleted.InvokeAsync(this, ea).ConfigureAwait(false);
@@ -3315,15 +3343,11 @@ internal async Task OnGuildApplicationCommandCountsUpdateAsync(int chatInputComm
 	{
 		var guild = this.InternalGetCachedGuild(guildId) ?? new DiscordGuild
 		{
-			Id = guildId,
-			Discord = this
+			Id = guildId, Discord = this
 		};
 		var ea = new GuildApplicationCommandCountEventArgs(this.ServiceProvider)
 		{
-			SlashCommands = chatInputCommandCount,
-			UserContextMenuCommands = userContextMenuCommandCount,
-			MessageContextMenuCommands = messageContextMenuCount,
-			Guild = guild
+			SlashCommands = chatInputCommandCount, UserContextMenuCommands = userContextMenuCommandCount, MessageContextMenuCommands = messageContextMenuCount, Guild = guild
 		};
 
 		await this._guildApplicationCommandCountUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
@@ -3354,28 +3378,22 @@ internal async Task OnApplicationCommandPermissionsUpdateAsync(IEnumerable<Disco
 		}
 
 		if (guild == null)
-		{
 			guild = new()
 			{
-				Id = guildId,
-				Discord = this
+				Id = guildId, Discord = this
 			};
-		}
 
 		var ea = new ApplicationCommandPermissionsUpdateEventArgs(this.ServiceProvider)
 		{
-			Permissions = perms.ToList(),
-			Command = cmd,
-			ApplicationId = applicationId,
-			Guild = guild
+			Permissions = perms.ToList(), Command = cmd, ApplicationId = applicationId, Guild = guild
 		};
 
 		await this._applicationCommandPermissionsUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Interaction
+#region Interaction
 
 	/// <summary>
 	/// Handles the interaction create event.
@@ -3394,7 +3412,11 @@ internal async Task OnInteractionCreateAsync(ulong? guildId, ulong channelId, Tr
 			//this.Logger.LogDebug("Interaction from {guild} on shard {shard}", guildId.HasValue ? guildId.Value : "dm", this.ShardId);
 			//this.Logger.LogDebug("Interaction: {interaction}", rawInteraction);
 		}
-		var usr = new DiscordUser(user) { Discord = this };
+
+		var usr = new DiscordUser(user)
+		{
+			Discord = this
+		};
 
 		interaction.ChannelId = channelId;
 		interaction.GuildId = guildId;
@@ -3403,13 +3425,14 @@ internal async Task OnInteractionCreateAsync(ulong? guildId, ulong channelId, Tr
 
 		if (member != null)
 		{
-			usr = new DiscordMember(member) { GuildId = guildId.Value, Discord = this };
+			usr = new DiscordMember(member)
+			{
+				GuildId = guildId.Value, Discord = this
+			};
 			this.UpdateUser(usr, guildId, interaction.Guild, member);
 		}
 		else
-		{
 			this.UserCache.AddOrUpdate(usr.Id, usr, (old, @new) => @new);
-		}
 
 		usr.Locale = interaction.Locale;
 		interaction.User = usr;
@@ -3418,16 +3441,13 @@ internal async Task OnInteractionCreateAsync(ulong? guildId, ulong channelId, Tr
 		if (resolved != null)
 		{
 			if (resolved.Users != null)
-			{
 				foreach (var c in resolved.Users)
 				{
 					c.Value.Discord = this;
 					this.UserCache.AddOrUpdate(c.Value.Id, c.Value, (old, @new) => @new);
 				}
-			}
 
 			if (resolved.Members != null)
-			{
 				foreach (var c in resolved.Members)
 				{
 					c.Value.Discord = this;
@@ -3436,10 +3456,8 @@ internal async Task OnInteractionCreateAsync(ulong? guildId, ulong channelId, Tr
 					c.Value.User.Discord = this;
 					this.UserCache.AddOrUpdate(c.Value.User.Id, c.Value.User, (old, @new) => @new);
 				}
-			}
 
 			if (resolved.Channels != null)
-			{
 				foreach (var c in resolved.Channels)
 				{
 					c.Value.Discord = this;
@@ -3456,10 +3474,8 @@ internal async Task OnInteractionCreateAsync(ulong? guildId, ulong channelId, Tr
 						catch (Exception) { }
 					}
 				}
-			}
 
 			if (resolved.Roles != null)
-			{
 				foreach (var c in resolved.Roles)
 				{
 					c.Value.Discord = this;
@@ -3467,11 +3483,8 @@ internal async Task OnInteractionCreateAsync(ulong? guildId, ulong channelId, Tr
 					if (guildId.HasValue)
 						c.Value.GuildId = guildId.Value;
 				}
-			}
-
 
 			if (resolved.Messages != null)
-			{
 				foreach (var m in resolved.Messages)
 				{
 					m.Value.Discord = this;
@@ -3479,8 +3492,6 @@ internal async Task OnInteractionCreateAsync(ulong? guildId, ulong channelId, Tr
 					if (guildId.HasValue)
 						m.Value.GuildId = guildId.Value;
 				}
-			}
-
 
 			if (resolved.Attachments != null)
 				foreach (var a in resolved.Attachments)
@@ -3494,10 +3505,10 @@ internal async Task OnInteractionCreateAsync(ulong? guildId, ulong channelId, Tr
 				interaction.Message.Discord = this;
 				interaction.Message.ChannelId = interaction.ChannelId;
 			}
+
 			var cea = new ComponentInteractionCreateEventArgs(this.ServiceProvider)
 			{
-				Message = interaction.Message,
-				Interaction = interaction
+				Message = interaction.Message, Interaction = interaction
 			};
 
 			await this._componentInteractionCreated.InvokeAsync(this, cea).ConfigureAwait(false);
@@ -3517,10 +3528,7 @@ internal async Task OnInteractionCreateAsync(ulong? guildId, ulong channelId, Tr
 
 				var ea = new ContextMenuInteractionCreateEventArgs(this.ServiceProvider)
 				{
-					Interaction = interaction,
-					TargetUser = targetMember ?? targetUser,
-					TargetMessage = targetMessage,
-					Type = interaction.Data.Type
+					Interaction = interaction, TargetUser = targetMember ?? targetUser, TargetMessage = targetMessage, Type = interaction.Data.Type
 				};
 				await this._contextMenuInteractionCreated.InvokeAsync(this, ea).ConfigureAwait(false);
 			}
@@ -3536,9 +3544,9 @@ internal async Task OnInteractionCreateAsync(ulong? guildId, ulong channelId, Tr
 		}
 	}
 
-	#endregion
+#endregion
 
-	#region Misc
+#region Misc
 
 	/// <summary>
 	/// Handles the entitlement create event.
@@ -3579,65 +3587,63 @@ internal async Task OnEntitlementDeleteAsync(DiscordEntitlement entitlement)
 		await this._entitlementDeleted.InvokeAsync(this, ea).ConfigureAwait(false);
 	}
 
-		/// <summary>
-		/// Handles the typing start event.
-		/// </summary>
-		/// <param name="userId">The user id.</param>
-		/// <param name="channelId">The channel id.</param>
-		/// <param name="channel">The channel.</param>
-		/// <param name="guildId">The optional guild id.</param>
-		/// <param name="started">The time when the user started typing.</param>
-		/// <param name="mbr">The transport member.</param>
-		internal async Task OnTypingStartEventAsync(ulong userId, ulong channelId, DiscordChannel channel, ulong? guildId, DateTimeOffset started, TransportMember mbr)
-		{
-			if (channel == null)
-			{
-				channel = new()
-				{
-					Discord = this,
-					Id = channelId,
-					GuildId = guildId ?? default,
-				};
-			}
-
-			var guild = this.InternalGetCachedGuild(guildId);
-			var usr = this.UpdateUser(new() { Id = userId, Discord = this }, guildId, guild, mbr);
-			var ea = new TypingStartEventArgs(this.ServiceProvider)
+	/// <summary>
+	/// Handles the typing start event.
+	/// </summary>
+	/// <param name="userId">The user id.</param>
+	/// <param name="channelId">The channel id.</param>
+	/// <param name="channel">The channel.</param>
+	/// <param name="guildId">The optional guild id.</param>
+	/// <param name="started">The time when the user started typing.</param>
+	/// <param name="mbr">The transport member.</param>
+	internal async Task OnTypingStartEventAsync(ulong userId, ulong channelId, DiscordChannel channel, ulong? guildId, DateTimeOffset started, TransportMember mbr)
+	{
+		if (channel == null)
+			channel = new()
 			{
-				Channel = channel,
-				User = usr,
-				Guild = guild,
-				StartedAt = started
+				Discord = this, Id = channelId, GuildId = guildId ?? default
 			};
-			await this._typingStarted.InvokeAsync(this, ea).ConfigureAwait(false);
-		}
 
-		/// <summary>
-		/// Handles the webhooks update.
-		/// </summary>
-		/// <param name="channel">The channel.</param>
-		/// <param name="guild">The guild.</param>
-		internal async Task OnWebhooksUpdateAsync(DiscordChannel channel, DiscordGuild guild)
+		var guild = this.InternalGetCachedGuild(guildId);
+		var usr = this.UpdateUser(new()
 		{
-			var ea = new WebhooksUpdateEventArgs(this.ServiceProvider)
-			{
-				Channel = channel,
-				Guild = guild
-			};
-			await this._webhooksUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
-		}
+			Id = userId, Discord = this
+		}, guildId, guild, mbr);
+		var ea = new TypingStartEventArgs(this.ServiceProvider)
+		{
+			Channel = channel, User = usr, Guild = guild, StartedAt = started
+		};
+		await this._typingStarted.InvokeAsync(this, ea).ConfigureAwait(false);
+	}
 
-		/// <summary>
-		/// Handles all unknown events.
-		/// </summary>
-		/// <param name="payload">The payload.</param>
-		internal async Task OnUnknownEventAsync(GatewayPayload payload)
+	/// <summary>
+	/// Handles the webhooks update.
+	/// </summary>
+	/// <param name="channel">The channel.</param>
+	/// <param name="guild">The guild.</param>
+	internal async Task OnWebhooksUpdateAsync(DiscordChannel channel, DiscordGuild guild)
+	{
+		var ea = new WebhooksUpdateEventArgs(this.ServiceProvider)
 		{
-			var ea = new UnknownEventArgs(this.ServiceProvider) { EventName = payload.EventName, Json = (payload.Data as JObject)?.ToString() };
-			await this._unknownEvent.InvokeAsync(this, ea).ConfigureAwait(false);
-		}
+			Channel = channel, Guild = guild
+		};
+		await this._webhooksUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
+	}
+
+	/// <summary>
+	/// Handles all unknown events.
+	/// </summary>
+	/// <param name="payload">The payload.</param>
+	internal async Task OnUnknownEventAsync(GatewayPayload payload)
+	{
+		var ea = new UnknownEventArgs(this.ServiceProvider)
+		{
+			EventName = payload.EventName, Json = (payload.Data as JObject)?.ToString()
+		};
+		await this._unknownEvent.InvokeAsync(this, ea).ConfigureAwait(false);
+	}
 
-		#endregion
+#endregion
 
-		#endregion
+#endregion
 }
diff --git a/DisCatSharp/Clients/DiscordClient.EventHandlers.cs b/DisCatSharp/Clients/DiscordClient.EventHandlers.cs
index bd9af03bd1..555f88b634 100644
--- a/DisCatSharp/Clients/DiscordClient.EventHandlers.cs
+++ b/DisCatSharp/Clients/DiscordClient.EventHandlers.cs
@@ -1,4 +1,3 @@
-
 #nullable enable
 using System;
 using System.Collections.Generic;
@@ -55,7 +54,7 @@ public void RegisterEventHandler(Type type)
 		{
 			var anon = ActivatorUtilities.CreateInstance(this.Configuration.ServiceProvider, type);
 
-			this._typeToAnonymousHandlers[type] = this._typeToAnonymousHandlers.TryGetValue(type, out var anonObjs) ? anonObjs : (anonObjs = new());
+			this._typeToAnonymousHandlers[type] = this._typeToAnonymousHandlers.TryGetValue(type, out var anonObjs) ? anonObjs : anonObjs = new();
 
 			anonObjs.Add(anon);
 
@@ -154,7 +153,6 @@ private static IEnumerable<Type> GetEventHandlersFromAssembly(Assembly assembly)
 	/// <param name="handler">The event handler object.</param>
 	/// <param name="type">The type.</param>
 	/// <param name="wasRegisteredWithStatic">Whether it considereded static methods.</param>
-
 	private void UnregisterEventHandlerImpl(object? handler, Type type, bool wasRegisteredWithStatic = true)
 	{
 		if (!this._registrationToDelegate.TryGetValue((handler, type, wasRegisteredWithStatic), out var delegateLists) || delegateLists.Count == 0)
@@ -179,19 +177,19 @@ private void RegisterEventHandlerImpl(object? handler, Type type, bool registerS
 		var delegates = (
 			from method in type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
 			let attribute = method.GetCustomAttribute<EventAttribute>()
-			where attribute is not null && ((registerStatic && method.IsStatic) || handler is not null)
+			where attribute is not null && (registerStatic && method.IsStatic || handler is not null)
 			let eventName = attribute.EventName ?? method.Name
 			let eventInfo = this.GetType().GetEvent(eventName)
-				?? throw new ArgumentException($"Tried to register handler to non-existent event \"{eventName}\"")
+			                ?? throw new ArgumentException($"Tried to register handler to non-existent event \"{eventName}\"")
 			let eventHandlerType = eventInfo.EventHandlerType
 			let dlgt = (method.IsStatic
-				? Delegate.CreateDelegate(eventHandlerType, method, false)
-				: Delegate.CreateDelegate(eventHandlerType, handler, method, false))
-				?? throw new ArgumentException($"Method \"{method}\" does not adhere to event specification \"{eventHandlerType}\"")
+				           ? Delegate.CreateDelegate(eventHandlerType, method, false)
+				           : Delegate.CreateDelegate(eventHandlerType, handler, method, false))
+			           ?? throw new ArgumentException($"Method \"{method}\" does not adhere to event specification \"{eventHandlerType}\"")
 			select (eventInfo, dlgt)
-			).ToArray();
+		).ToArray();
 
-		this._registrationToDelegate[(handler, type, registerStatic)] = this._registrationToDelegate.TryGetValue((handler, type, registerStatic), out var delList) ? delList : (delList = new());
+		this._registrationToDelegate[(handler, type, registerStatic)] = this._registrationToDelegate.TryGetValue((handler, type, registerStatic), out var delList) ? delList : delList = new();
 
 		delList.Add(delegates);
 
diff --git a/DisCatSharp/Clients/DiscordClient.Events.cs b/DisCatSharp/Clients/DiscordClient.Events.cs
index e21217d054..4d1e609550 100644
--- a/DisCatSharp/Clients/DiscordClient.Events.cs
+++ b/DisCatSharp/Clients/DiscordClient.Events.cs
@@ -9,7 +9,7 @@
 namespace DisCatSharp;
 
 /// <summary>
-/// Represents a discord client.
+/// A Discord API wrapper.
 /// </summary>
 public sealed partial class DiscordClient
 {
@@ -18,7 +18,7 @@ public sealed partial class DiscordClient
 	/// </summary>
 	internal static TimeSpan EventExecutionLimit { get; } = TimeSpan.FromSeconds(1);
 
-	#region WebSocket
+#region WebSocket
 
 	/// <summary>
 	/// Fired whenever a WebSocket error occurs within the client.
@@ -28,6 +28,7 @@ public event AsyncEventHandler<DiscordClient, SocketErrorEventArgs> SocketErrore
 		add => this._socketErrored.Register(value);
 		remove => this._socketErrored.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, SocketErrorEventArgs> _socketErrored;
 
 	/// <summary>
@@ -38,6 +39,7 @@ public event AsyncEventHandler<DiscordClient, SocketEventArgs> SocketOpened
 		add => this._socketOpened.Register(value);
 		remove => this._socketOpened.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, SocketEventArgs> _socketOpened;
 
 	/// <summary>
@@ -48,6 +50,7 @@ public event AsyncEventHandler<DiscordClient, SocketCloseEventArgs> SocketClosed
 		add => this._socketClosed.Register(value);
 		remove => this._socketClosed.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, SocketCloseEventArgs> _socketClosed;
 
 	/// <summary>
@@ -58,6 +61,7 @@ public event AsyncEventHandler<DiscordClient, ReadyEventArgs> Ready
 		add => this._ready.Register(value);
 		remove => this._ready.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ReadyEventArgs> _ready;
 
 	/// <summary>
@@ -68,6 +72,7 @@ public event AsyncEventHandler<DiscordClient, ReadyEventArgs> Resumed
 		add => this._resumed.Register(value);
 		remove => this._resumed.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ReadyEventArgs> _resumed;
 
 	/// <summary>
@@ -78,11 +83,12 @@ public event AsyncEventHandler<DiscordClient, HeartbeatEventArgs> Heartbeated
 		add => this._heartbeated.Register(value);
 		remove => this._heartbeated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, HeartbeatEventArgs> _heartbeated;
 
-	#endregion
+#endregion
 
-	#region Channel
+#region Channel
 
 	/// <summary>
 	/// Fired when a new channel is created.
@@ -93,6 +99,7 @@ public event AsyncEventHandler<DiscordClient, ChannelCreateEventArgs> ChannelCre
 		add => this._channelCreated.Register(value);
 		remove => this._channelCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ChannelCreateEventArgs> _channelCreated;
 
 	/// <summary>
@@ -104,6 +111,7 @@ public event AsyncEventHandler<DiscordClient, ChannelUpdateEventArgs> ChannelUpd
 		add => this._channelUpdated.Register(value);
 		remove => this._channelUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ChannelUpdateEventArgs> _channelUpdated;
 
 	/// <summary>
@@ -115,6 +123,7 @@ public event AsyncEventHandler<DiscordClient, ChannelDeleteEventArgs> ChannelDel
 		add => this._channelDeleted.Register(value);
 		remove => this._channelDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ChannelDeleteEventArgs> _channelDeleted;
 
 	/// <summary>
@@ -126,6 +135,7 @@ public event AsyncEventHandler<DiscordClient, DmChannelDeleteEventArgs> DmChanne
 		add => this._dmChannelDeleted.Register(value);
 		remove => this._dmChannelDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, DmChannelDeleteEventArgs> _dmChannelDeleted;
 
 	/// <summary>
@@ -137,6 +147,7 @@ public event AsyncEventHandler<DiscordClient, ChannelPinsUpdateEventArgs> Channe
 		add => this._channelPinsUpdated.Register(value);
 		remove => this._channelPinsUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ChannelPinsUpdateEventArgs> _channelPinsUpdated;
 
 	/// <summary>
@@ -148,11 +159,12 @@ public event AsyncEventHandler<DiscordClient, VoiceChannelStatusUpdateEventArgs>
 		add => this._voiceChannelStatusUpdated.Register(value);
 		remove => this._voiceChannelStatusUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, VoiceChannelStatusUpdateEventArgs> _voiceChannelStatusUpdated;
 
-	#endregion
+#endregion
 
-	#region Guild
+#region Guild
 
 	/// <summary>
 	/// Fired when the user joins a new guild.
@@ -164,6 +176,7 @@ public event AsyncEventHandler<DiscordClient, GuildCreateEventArgs> GuildCreated
 		add => this._guildCreated.Register(value);
 		remove => this._guildCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildCreateEventArgs> _guildCreated;
 
 	/// <summary>
@@ -175,6 +188,7 @@ public event AsyncEventHandler<DiscordClient, GuildCreateEventArgs> GuildAvailab
 		add => this._guildAvailable.Register(value);
 		remove => this._guildAvailable.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildCreateEventArgs> _guildAvailable;
 
 	/// <summary>
@@ -186,6 +200,7 @@ public event AsyncEventHandler<DiscordClient, GuildUpdateEventArgs> GuildUpdated
 		add => this._guildUpdated.Register(value);
 		remove => this._guildUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildUpdateEventArgs> _guildUpdated;
 
 	/// <summary>
@@ -197,6 +212,7 @@ public event AsyncEventHandler<DiscordClient, GuildDeleteEventArgs> GuildDeleted
 		add => this._guildDeleted.Register(value);
 		remove => this._guildDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildDeleteEventArgs> _guildDeleted;
 
 	/// <summary>
@@ -207,6 +223,7 @@ public event AsyncEventHandler<DiscordClient, GuildDeleteEventArgs> GuildUnavail
 		add => this._guildUnavailable.Register(value);
 		remove => this._guildUnavailable.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildDeleteEventArgs> _guildUnavailable;
 
 	/// <summary>
@@ -217,6 +234,7 @@ public event AsyncEventHandler<DiscordClient, GuildDownloadCompletedEventArgs> G
 		add => this._guildDownloadCompletedEv.Register(value);
 		remove => this._guildDownloadCompletedEv.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildDownloadCompletedEventArgs> _guildDownloadCompletedEv;
 
 	/// <summary>
@@ -228,6 +246,7 @@ public event AsyncEventHandler<DiscordClient, GuildEmojisUpdateEventArgs> GuildE
 		add => this._guildEmojisUpdated.Register(value);
 		remove => this._guildEmojisUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildEmojisUpdateEventArgs> _guildEmojisUpdated;
 
 	/// <summary>
@@ -239,6 +258,7 @@ public event AsyncEventHandler<DiscordClient, GuildStickersUpdateEventArgs> Guil
 		add => this._guildStickersUpdated.Register(value);
 		remove => this._guildStickersUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildStickersUpdateEventArgs> _guildStickersUpdated;
 
 	/// <summary>
@@ -249,6 +269,7 @@ public event AsyncEventHandler<DiscordClient, GuildIntegrationsUpdateEventArgs>
 		add => this._guildIntegrationsUpdated.Register(value);
 		remove => this._guildIntegrationsUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildIntegrationsUpdateEventArgs> _guildIntegrationsUpdated;
 
 	/// <summary>
@@ -260,12 +281,13 @@ public event AsyncEventHandler<DiscordClient, GuildAuditLogEntryCreateEventArgs>
 		add => this._guildAuditLogEntryCreated.Register(value);
 		remove => this._guildAuditLogEntryCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildAuditLogEntryCreateEventArgs> _guildAuditLogEntryCreated;
 
+#endregion
 
-	#endregion
+#region Automod
 
-	#region Automod
 	/// <summary>
 	/// Fired when an auto mod rule gets created.
 	/// </summary>
@@ -274,6 +296,7 @@ public event AsyncEventHandler<DiscordClient, AutomodRuleCreateEventArgs> Automo
 		add => this._automodRuleCreated.Register(value);
 		remove => this._automodRuleCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, AutomodRuleCreateEventArgs> _automodRuleCreated;
 
 	/// <summary>
@@ -284,6 +307,7 @@ public event AsyncEventHandler<DiscordClient, AutomodRuleUpdateEventArgs> Automo
 		add => this._automodRuleUpdated.Register(value);
 		remove => this._automodRuleUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, AutomodRuleUpdateEventArgs> _automodRuleUpdated;
 
 	/// <summary>
@@ -294,6 +318,7 @@ public event AsyncEventHandler<DiscordClient, AutomodRuleDeleteEventArgs> Automo
 		add => this._automodRuleDeleted.Register(value);
 		remove => this._automodRuleDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, AutomodRuleDeleteEventArgs> _automodRuleDeleted;
 
 	/// <summary>
@@ -304,11 +329,12 @@ public event AsyncEventHandler<DiscordClient, AutomodActionExecutedEventArgs> Au
 		add => this._automodActionExecuted.Register(value);
 		remove => this._automodActionExecuted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, AutomodActionExecutedEventArgs> _automodActionExecuted;
 
-	#endregion
+#endregion
 
-	#region Guild Ban
+#region Guild Ban
 
 	/// <summary>
 	/// Fired when a guild ban gets added
@@ -319,6 +345,7 @@ public event AsyncEventHandler<DiscordClient, GuildBanAddEventArgs> GuildBanAdde
 		add => this._guildBanAdded.Register(value);
 		remove => this._guildBanAdded.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildBanAddEventArgs> _guildBanAdded;
 
 	/// <summary>
@@ -330,11 +357,12 @@ public event AsyncEventHandler<DiscordClient, GuildBanRemoveEventArgs> GuildBanR
 		add => this._guildBanRemoved.Register(value);
 		remove => this._guildBanRemoved.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildBanRemoveEventArgs> _guildBanRemoved;
 
-	#endregion
+#endregion
 
-	#region Guild Timeout
+#region Guild Timeout
 
 	/// <summary>
 	/// Fired when a guild member timeout gets added.
@@ -345,6 +373,7 @@ public event AsyncEventHandler<DiscordClient, GuildMemberTimeoutAddEventArgs> Gu
 		add => this._guildMemberTimeoutAdded.Register(value);
 		remove => this._guildMemberTimeoutAdded.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMemberTimeoutAddEventArgs> _guildMemberTimeoutAdded;
 
 	/// <summary>
@@ -356,8 +385,8 @@ public event AsyncEventHandler<DiscordClient, GuildMemberTimeoutUpdateEventArgs>
 		add => this._guildMemberTimeoutChanged.Register(value);
 		remove => this._guildMemberTimeoutChanged.Unregister(value);
 	}
-	private AsyncEvent<DiscordClient, GuildMemberTimeoutUpdateEventArgs> _guildMemberTimeoutChanged;
 
+	private AsyncEvent<DiscordClient, GuildMemberTimeoutUpdateEventArgs> _guildMemberTimeoutChanged;
 
 	/// <summary>
 	/// Fired when a guild member timeout gets removed.
@@ -368,11 +397,12 @@ public event AsyncEventHandler<DiscordClient, GuildMemberTimeoutRemoveEventArgs>
 		add => this._guildMemberTimeoutRemoved.Register(value);
 		remove => this._guildMemberTimeoutRemoved.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMemberTimeoutRemoveEventArgs> _guildMemberTimeoutRemoved;
 
-	#endregion
+#endregion
 
-	#region Guild Scheduled Event
+#region Guild Scheduled Event
 
 	/// <summary>
 	/// Fired when a scheduled Event is created.
@@ -383,6 +413,7 @@ public event AsyncEventHandler<DiscordClient, GuildScheduledEventCreateEventArgs
 		add => this._guildScheduledEventCreated.Register(value);
 		remove => this._guildScheduledEventCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildScheduledEventCreateEventArgs> _guildScheduledEventCreated;
 
 	/// <summary>
@@ -394,6 +425,7 @@ public event AsyncEventHandler<DiscordClient, GuildScheduledEventUpdateEventArgs
 		add => this._guildScheduledEventUpdated.Register(value);
 		remove => this._guildScheduledEventUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildScheduledEventUpdateEventArgs> _guildScheduledEventUpdated;
 
 	/// <summary>
@@ -405,6 +437,7 @@ public event AsyncEventHandler<DiscordClient, GuildScheduledEventDeleteEventArgs
 		add => this._guildScheduledEventDeleted.Register(value);
 		remove => this._guildScheduledEventDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildScheduledEventDeleteEventArgs> _guildScheduledEventDeleted;
 
 	/// <summary>
@@ -416,6 +449,7 @@ public event AsyncEventHandler<DiscordClient, GuildScheduledEventUserAddEventArg
 		add => this._guildScheduledEventUserAdded.Register(value);
 		remove => this._guildScheduledEventUserAdded.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildScheduledEventUserAddEventArgs> _guildScheduledEventUserAdded;
 
 	/// <summary>
@@ -427,11 +461,12 @@ public event AsyncEventHandler<DiscordClient, GuildScheduledEventUserRemoveEvent
 		add => this._guildScheduledEventUserRemoved.Register(value);
 		remove => this._guildScheduledEventUserRemoved.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildScheduledEventUserRemoveEventArgs> _guildScheduledEventUserRemoved;
 
-	#endregion
+#endregion
 
-	#region Guild Integration
+#region Guild Integration
 
 	/// <summary>
 	/// Fired when a guild integration is created.
@@ -442,6 +477,7 @@ public event AsyncEventHandler<DiscordClient, GuildIntegrationCreateEventArgs> G
 		add => this._guildIntegrationCreated.Register(value);
 		remove => this._guildIntegrationCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildIntegrationCreateEventArgs> _guildIntegrationCreated;
 
 	/// <summary>
@@ -453,6 +489,7 @@ public event AsyncEventHandler<DiscordClient, GuildIntegrationUpdateEventArgs> G
 		add => this._guildIntegrationUpdated.Register(value);
 		remove => this._guildIntegrationUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildIntegrationUpdateEventArgs> _guildIntegrationUpdated;
 
 	/// <summary>
@@ -464,11 +501,12 @@ public event AsyncEventHandler<DiscordClient, GuildIntegrationDeleteEventArgs> G
 		add => this._guildIntegrationDeleted.Register(value);
 		remove => this._guildIntegrationDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildIntegrationDeleteEventArgs> _guildIntegrationDeleted;
 
-	#endregion
+#endregion
 
-	#region Guild Member
+#region Guild Member
 
 	/// <summary>
 	/// Fired when a new user joins a guild.
@@ -479,6 +517,7 @@ public event AsyncEventHandler<DiscordClient, GuildMemberAddEventArgs> GuildMemb
 		add => this._guildMemberAdded.Register(value);
 		remove => this._guildMemberAdded.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMemberAddEventArgs> _guildMemberAdded;
 
 	/// <summary>
@@ -490,6 +529,7 @@ public event AsyncEventHandler<DiscordClient, GuildMemberRemoveEventArgs> GuildM
 		add => this._guildMemberRemoved.Register(value);
 		remove => this._guildMemberRemoved.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMemberRemoveEventArgs> _guildMemberRemoved;
 
 	/// <summary>
@@ -501,6 +541,7 @@ public event AsyncEventHandler<DiscordClient, GuildMemberUpdateEventArgs> GuildM
 		add => this._guildMemberUpdated.Register(value);
 		remove => this._guildMemberUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMemberUpdateEventArgs> _guildMemberUpdated;
 
 	/// <summary>
@@ -511,11 +552,12 @@ public event AsyncEventHandler<DiscordClient, GuildMembersChunkEventArgs> GuildM
 		add => this._guildMembersChunked.Register(value);
 		remove => this._guildMembersChunked.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMembersChunkEventArgs> _guildMembersChunked;
 
-	#endregion
+#endregion
 
-	#region Guild Role
+#region Guild Role
 
 	/// <summary>
 	/// Fired when a guild role is created.
@@ -526,6 +568,7 @@ public event AsyncEventHandler<DiscordClient, GuildRoleCreateEventArgs> GuildRol
 		add => this._guildRoleCreated.Register(value);
 		remove => this._guildRoleCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildRoleCreateEventArgs> _guildRoleCreated;
 
 	/// <summary>
@@ -537,6 +580,7 @@ public event AsyncEventHandler<DiscordClient, GuildRoleUpdateEventArgs> GuildRol
 		add => this._guildRoleUpdated.Register(value);
 		remove => this._guildRoleUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildRoleUpdateEventArgs> _guildRoleUpdated;
 
 	/// <summary>
@@ -548,11 +592,12 @@ public event AsyncEventHandler<DiscordClient, GuildRoleDeleteEventArgs> GuildRol
 		add => this._guildRoleDeleted.Register(value);
 		remove => this._guildRoleDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildRoleDeleteEventArgs> _guildRoleDeleted;
 
-	#endregion
+#endregion
 
-	#region Invite
+#region Invite
 
 	/// <summary>
 	/// Fired when an invite is created.
@@ -563,6 +608,7 @@ public event AsyncEventHandler<DiscordClient, InviteCreateEventArgs> InviteCreat
 		add => this._inviteCreated.Register(value);
 		remove => this._inviteCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, InviteCreateEventArgs> _inviteCreated;
 
 	/// <summary>
@@ -574,11 +620,12 @@ public event AsyncEventHandler<DiscordClient, InviteDeleteEventArgs> InviteDelet
 		add => this._inviteDeleted.Register(value);
 		remove => this._inviteDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, InviteDeleteEventArgs> _inviteDeleted;
 
-	#endregion
+#endregion
 
-	#region Message
+#region Message
 
 	/// <summary>
 	/// Fired when a message is created.
@@ -589,6 +636,7 @@ public event AsyncEventHandler<DiscordClient, MessageCreateEventArgs> MessageCre
 		add => this._messageCreated.Register(value);
 		remove => this._messageCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageCreateEventArgs> _messageCreated;
 
 	/// <summary>
@@ -600,6 +648,7 @@ public event AsyncEventHandler<DiscordClient, MessageAcknowledgeEventArgs> Messa
 		add => this._messageAcknowledged.Register(value);
 		remove => this._messageAcknowledged.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageAcknowledgeEventArgs> _messageAcknowledged;
 
 	/// <summary>
@@ -611,6 +660,7 @@ public event AsyncEventHandler<DiscordClient, MessageUpdateEventArgs> MessageUpd
 		add => this._messageUpdated.Register(value);
 		remove => this._messageUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageUpdateEventArgs> _messageUpdated;
 
 	/// <summary>
@@ -622,6 +672,7 @@ public event AsyncEventHandler<DiscordClient, MessageDeleteEventArgs> MessageDel
 		add => this._messageDeleted.Register(value);
 		remove => this._messageDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageDeleteEventArgs> _messageDeleted;
 
 	/// <summary>
@@ -633,11 +684,12 @@ public event AsyncEventHandler<DiscordClient, MessageBulkDeleteEventArgs> Messag
 		add => this._messagesBulkDeleted.Register(value);
 		remove => this._messagesBulkDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageBulkDeleteEventArgs> _messagesBulkDeleted;
 
-	#endregion
+#endregion
 
-	#region Message Reaction
+#region Message Reaction
 
 	/// <summary>
 	/// Fired when a reaction gets added to a message.
@@ -648,6 +700,7 @@ public event AsyncEventHandler<DiscordClient, MessageReactionAddEventArgs> Messa
 		add => this._messageReactionAdded.Register(value);
 		remove => this._messageReactionAdded.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageReactionAddEventArgs> _messageReactionAdded;
 
 	/// <summary>
@@ -659,6 +712,7 @@ public event AsyncEventHandler<DiscordClient, MessageReactionRemoveEventArgs> Me
 		add => this._messageReactionRemoved.Register(value);
 		remove => this._messageReactionRemoved.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageReactionRemoveEventArgs> _messageReactionRemoved;
 
 	/// <summary>
@@ -670,6 +724,7 @@ public event AsyncEventHandler<DiscordClient, MessageReactionsClearEventArgs> Me
 		add => this._messageReactionsCleared.Register(value);
 		remove => this._messageReactionsCleared.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageReactionsClearEventArgs> _messageReactionsCleared;
 
 	/// <summary>
@@ -681,11 +736,12 @@ public event AsyncEventHandler<DiscordClient, MessageReactionRemoveEmojiEventArg
 		add => this._messageReactionRemovedEmoji.Register(value);
 		remove => this._messageReactionRemovedEmoji.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageReactionRemoveEmojiEventArgs> _messageReactionRemovedEmoji;
 
-	#endregion
+#endregion
 
-	#region Activities
+#region Activities
 
 	/// <summary>
 	/// Fired when a embedded activity has been updated.
@@ -695,11 +751,12 @@ public event AsyncEventHandler<DiscordClient, EmbeddedActivityUpdateEventArgs> E
 		add => this._embeddedActivityUpdated.Register(value);
 		remove => this._embeddedActivityUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, EmbeddedActivityUpdateEventArgs> _embeddedActivityUpdated;
 
-	#endregion
+#endregion
 
-	#region Presence/User Update
+#region Presence/User Update
 
 	/// <summary>
 	/// Fired when a presence has been updated.
@@ -710,8 +767,8 @@ public event AsyncEventHandler<DiscordClient, PresenceUpdateEventArgs> PresenceU
 		add => this._presenceUpdated.Register(value);
 		remove => this._presenceUpdated.Unregister(value);
 	}
-	private AsyncEvent<DiscordClient, PresenceUpdateEventArgs> _presenceUpdated;
 
+	private AsyncEvent<DiscordClient, PresenceUpdateEventArgs> _presenceUpdated;
 
 	/// <summary>
 	/// Fired when the current user updates their settings.
@@ -722,6 +779,7 @@ public event AsyncEventHandler<DiscordClient, UserSettingsUpdateEventArgs> UserS
 		add => this._userSettingsUpdated.Register(value);
 		remove => this._userSettingsUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, UserSettingsUpdateEventArgs> _userSettingsUpdated;
 
 	/// <summary>
@@ -736,11 +794,12 @@ public event AsyncEventHandler<DiscordClient, UserUpdateEventArgs> UserUpdated
 		add => this._userUpdated.Register(value);
 		remove => this._userUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, UserUpdateEventArgs> _userUpdated;
 
-	#endregion
+#endregion
 
-	#region Stage Instance
+#region Stage Instance
 
 	/// <summary>
 	/// Fired when a Stage Instance is created.
@@ -751,6 +810,7 @@ public event AsyncEventHandler<DiscordClient, StageInstanceCreateEventArgs> Stag
 		add => this._stageInstanceCreated.Register(value);
 		remove => this._stageInstanceCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, StageInstanceCreateEventArgs> _stageInstanceCreated;
 
 	/// <summary>
@@ -762,6 +822,7 @@ public event AsyncEventHandler<DiscordClient, StageInstanceUpdateEventArgs> Stag
 		add => this._stageInstanceUpdated.Register(value);
 		remove => this._stageInstanceUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, StageInstanceUpdateEventArgs> _stageInstanceUpdated;
 
 	/// <summary>
@@ -773,11 +834,12 @@ public event AsyncEventHandler<DiscordClient, StageInstanceDeleteEventArgs> Stag
 		add => this._stageInstanceDeleted.Register(value);
 		remove => this._stageInstanceDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, StageInstanceDeleteEventArgs> _stageInstanceDeleted;
 
-	#endregion
+#endregion
 
-	#region Thread
+#region Thread
 
 	/// <summary>
 	/// Fired when a thread is created.
@@ -788,6 +850,7 @@ public event AsyncEventHandler<DiscordClient, ThreadCreateEventArgs> ThreadCreat
 		add => this._threadCreated.Register(value);
 		remove => this._threadCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadCreateEventArgs> _threadCreated;
 
 	/// <summary>
@@ -799,6 +862,7 @@ public event AsyncEventHandler<DiscordClient, ThreadUpdateEventArgs> ThreadUpdat
 		add => this._threadUpdated.Register(value);
 		remove => this._threadUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadUpdateEventArgs> _threadUpdated;
 
 	/// <summary>
@@ -810,6 +874,7 @@ public event AsyncEventHandler<DiscordClient, ThreadDeleteEventArgs> ThreadDelet
 		add => this._threadDeleted.Register(value);
 		remove => this._threadDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadDeleteEventArgs> _threadDeleted;
 
 	/// <summary>
@@ -821,6 +886,7 @@ public event AsyncEventHandler<DiscordClient, ThreadListSyncEventArgs> ThreadLis
 		add => this._threadListSynced.Register(value);
 		remove => this._threadListSynced.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadListSyncEventArgs> _threadListSynced;
 
 	/// <summary>
@@ -832,6 +898,7 @@ public event AsyncEventHandler<DiscordClient, ThreadMemberUpdateEventArgs> Threa
 		add => this._threadMemberUpdated.Register(value);
 		remove => this._threadMemberUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadMemberUpdateEventArgs> _threadMemberUpdated;
 
 	/// <summary>
@@ -843,11 +910,12 @@ public event AsyncEventHandler<DiscordClient, ThreadMembersUpdateEventArgs> Thre
 		add => this._threadMembersUpdated.Register(value);
 		remove => this._threadMembersUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadMembersUpdateEventArgs> _threadMembersUpdated;
 
-	#endregion
+#endregion
 
-	#region Voice
+#region Voice
 
 	/// <summary>
 	/// Fired when someone joins/leaves/moves voice channels.
@@ -858,6 +926,7 @@ public event AsyncEventHandler<DiscordClient, VoiceStateUpdateEventArgs> VoiceSt
 		add => this._voiceStateUpdated.Register(value);
 		remove => this._voiceStateUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, VoiceStateUpdateEventArgs> _voiceStateUpdated;
 
 	/// <summary>
@@ -869,11 +938,12 @@ public event AsyncEventHandler<DiscordClient, VoiceServerUpdateEventArgs> VoiceS
 		add => this._voiceServerUpdated.Register(value);
 		remove => this._voiceServerUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, VoiceServerUpdateEventArgs> _voiceServerUpdated;
 
-	#endregion
+#endregion
 
-	#region Application
+#region Application
 
 	/// <summary>
 	/// Fired when a new application command is registered.
@@ -883,6 +953,7 @@ public event AsyncEventHandler<DiscordClient, ApplicationCommandEventArgs> Appli
 		add => this._applicationCommandCreated.Register(value);
 		remove => this._applicationCommandCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ApplicationCommandEventArgs> _applicationCommandCreated;
 
 	/// <summary>
@@ -893,6 +964,7 @@ public event AsyncEventHandler<DiscordClient, ApplicationCommandEventArgs> Appli
 		add => this._applicationCommandUpdated.Register(value);
 		remove => this._applicationCommandUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ApplicationCommandEventArgs> _applicationCommandUpdated;
 
 	/// <summary>
@@ -903,6 +975,7 @@ public event AsyncEventHandler<DiscordClient, ApplicationCommandEventArgs> Appli
 		add => this._applicationCommandDeleted.Register(value);
 		remove => this._applicationCommandDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ApplicationCommandEventArgs> _applicationCommandDeleted;
 
 	/// <summary>
@@ -913,6 +986,7 @@ public event AsyncEventHandler<DiscordClient, GuildApplicationCommandCountEventA
 		add => this._guildApplicationCommandCountUpdated.Register(value);
 		remove => this._guildApplicationCommandCountUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildApplicationCommandCountEventArgs> _guildApplicationCommandCountUpdated;
 
 	/// <summary>
@@ -937,9 +1011,9 @@ public event AsyncEventHandler<DiscordClient, ApplicationCommandPermissionsUpdat
 
 	private AsyncEvent<DiscordClient, ApplicationCommandPermissionsUpdateEventArgs> _applicationCommandPermissionsUpdated;
 
-	#endregion
+#endregion
 
-	#region Misc
+#region Misc
 
 	/// <summary>
 	/// Fired when an interaction is invoked.
@@ -949,6 +1023,7 @@ public event AsyncEventHandler<DiscordClient, InteractionCreateEventArgs> Intera
 		add => this._interactionCreated.Register(value);
 		remove => this._interactionCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, InteractionCreateEventArgs> _interactionCreated;
 
 	/// <summary>
@@ -959,6 +1034,7 @@ public event AsyncEventHandler<DiscordClient, ComponentInteractionCreateEventArg
 		add => this._componentInteractionCreated.Register(value);
 		remove => this._componentInteractionCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ComponentInteractionCreateEventArgs> _componentInteractionCreated;
 
 	/// <summary>
@@ -969,6 +1045,7 @@ public event AsyncEventHandler<DiscordClient, EntitlementCreateEventArgs> Entitl
 		add => this._entitlementCreated.Register(value);
 		remove => this._entitlementCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, EntitlementCreateEventArgs> _entitlementCreated;
 
 	/// <summary>
@@ -979,6 +1056,7 @@ public event AsyncEventHandler<DiscordClient, EntitlementUpdateEventArgs> Entitl
 		add => this._entitlementUpdated.Register(value);
 		remove => this._entitlementUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, EntitlementUpdateEventArgs> _entitlementUpdated;
 
 	/// <summary>
@@ -1000,6 +1078,7 @@ public event AsyncEventHandler<DiscordClient, TypingStartEventArgs> TypingStarte
 		add => this._typingStarted.Register(value);
 		remove => this._typingStarted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, TypingStartEventArgs> _typingStarted;
 
 	/// <summary>
@@ -1010,6 +1089,7 @@ public event AsyncEventHandler<DiscordClient, UnknownEventArgs> UnknownEvent
 		add => this._unknownEvent.Register(value);
 		remove => this._unknownEvent.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, UnknownEventArgs> _unknownEvent;
 
 	/// <summary>
@@ -1020,6 +1100,7 @@ public event AsyncEventHandler<DiscordClient, WebhooksUpdateEventArgs> WebhooksU
 		add => this._webhooksUpdated.Register(value);
 		remove => this._webhooksUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, WebhooksUpdateEventArgs> _webhooksUpdated;
 
 	/// <summary>
@@ -1030,10 +1111,12 @@ public event AsyncEventHandler<DiscordClient, ClientErrorEventArgs> ClientErrore
 		add => this._clientErrored.Register(value);
 		remove => this._clientErrored.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ClientErrorEventArgs> _clientErrored;
-	#endregion
 
-	#region Error Handling
+#endregion
+
+#region Error Handling
 
 	/// <summary>
 	/// Handles event errors.
@@ -1053,7 +1136,10 @@ internal void EventErrorHandler<TSender, TArgs>(AsyncEvent<TSender, TArgs> async
 		}
 
 		this.Logger.LogError(LoggerEvents.EventHandlerException, ex, "Event handler exception for event {0} thrown from {1} (defined in {2})", asyncEvent.Name, handler.Method, handler.Method.DeclaringType);
-		this._clientErrored.InvokeAsync(this, new(this.ServiceProvider) { EventName = asyncEvent.Name, Exception = ex }).ConfigureAwait(false).GetAwaiter().GetResult();
+		this._clientErrored.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			EventName = asyncEvent.Name, Exception = ex
+		}).ConfigureAwait(false).GetAwaiter().GetResult();
 	}
 
 	/// <summary>
@@ -1064,6 +1150,7 @@ public event AsyncEventHandler<DiscordClient, RateLimitExceptionEventArgs> RateL
 		add => this.RateLimitHitInternal.Register(value);
 		remove => this.RateLimitHitInternal.Unregister(value);
 	}
+
 	internal AsyncEvent<DiscordClient, RateLimitExceptionEventArgs> RateLimitHitInternal;
 
 	/// <summary>
@@ -1074,6 +1161,7 @@ public event AsyncEventHandler<DiscordClient, ZombiedEventArgs> Zombied
 		add => this._zombied.Register(value);
 		remove => this._zombied.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ZombiedEventArgs> _zombied;
 
 	/// <summary>
@@ -1085,6 +1173,7 @@ public event AsyncEventHandler<DiscordClient, PayloadReceivedEventArgs> PayloadR
 		add => this._payloadReceived.Register(value);
 		remove => this._payloadReceived.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, PayloadReceivedEventArgs> _payloadReceived;
 
 	/// <summary>
@@ -1098,5 +1187,5 @@ public event AsyncEventHandler<DiscordClient, PayloadReceivedEventArgs> PayloadR
 	private void Goof<TSender, TArgs>(AsyncEvent<TSender, TArgs> asyncEvent, Exception ex, AsyncEventHandler<TSender, TArgs> handler, TSender sender, TArgs eventArgs)
 		where TArgs : AsyncEventArgs => this.Logger.LogCritical(LoggerEvents.EventHandlerException, ex, "Exception event handler {0} (defined in {1}) threw an exception", handler.Method, handler.Method.DeclaringType);
 
-	#endregion
+#endregion
 }
diff --git a/DisCatSharp/Clients/DiscordClient.WebSocket.cs b/DisCatSharp/Clients/DiscordClient.WebSocket.cs
index ae5d4ca4b7..20bb1455ea 100644
--- a/DisCatSharp/Clients/DiscordClient.WebSocket.cs
+++ b/DisCatSharp/Clients/DiscordClient.WebSocket.cs
@@ -20,11 +20,11 @@
 namespace DisCatSharp;
 
 /// <summary>
-/// Represents a discord websocket client.
+/// A Discord API wrapper.
 /// </summary>
 public sealed partial class DiscordClient
 {
-	#region Private Fields
+#region Private Fields
 
 	private int _heartbeatInterval;
 	private DateTimeOffset _lastHeartbeat;
@@ -41,9 +41,9 @@ public sealed partial class DiscordClient
 	private CancellationTokenSource _cancelTokenSource;
 	private CancellationToken _cancelToken;
 
-	#endregion
+#endregion
 
-	#region Connection Semaphore
+#region Connection Semaphore
 
 	/// <summary>
 	/// Gets the socket locks.
@@ -53,11 +53,11 @@ public sealed partial class DiscordClient
 	/// <summary>
 	/// Gets the session lock.
 	/// </summary>
-	private readonly ManualResetEventSlim _sessionLock  = new(true);
+	private readonly ManualResetEventSlim _sessionLock = new(true);
 
-	#endregion
+#endregion
 
-	#region Internal Connection Methods
+#region Internal Connection Methods
 
 	/// <summary>
 	/// Reconnects the websocket client.
@@ -96,7 +96,6 @@ internal async Task InternalConnectAsync()
 		}
 
 		if (!this.Presences.ContainsKey(this.CurrentUser.Id))
-		{
 			this.PresencesInternal[this.CurrentUser.Id] = new()
 			{
 				Discord = this,
@@ -108,7 +107,6 @@ internal async Task InternalConnectAsync()
 					Id = this.CurrentUser.Id
 				}
 			};
-		}
 		else
 		{
 			var pr = this.PresencesInternal[this.CurrentUser.Id];
@@ -143,8 +141,6 @@ internal async Task InternalConnectAsync()
 
 		await this.WebSocketClient.ConnectAsync(gwuri.Build()).ConfigureAwait(false);
 
-
-
 		Task SocketOnConnect(IWebSocketClient sender, SocketEventArgs e)
 			=> this._socketOpened.InvokeAsync(this, e);
 
@@ -152,9 +148,7 @@ async Task SocketOnMessage(IWebSocketClient sender, SocketMessageEventArgs e)
 		{
 			string msg = null;
 			if (e is SocketTextMessageEventArgs etext)
-			{
 				msg = etext.Message;
-			}
 			else if (e is SocketBinaryMessageEventArgs ebin)
 			{
 				using var ms = new MemoryStream();
@@ -197,7 +191,6 @@ async Task SocketOnDisconnect(IWebSocketClient sender, SocketCloseEventArgs e)
 			this.Logger.LogDebug(LoggerEvents.ConnectionClose, "Connection closed ({0}, '{1}')", e.CloseCode, e.CloseMessage);
 			await this._socketClosed.InvokeAsync(this, e).ConfigureAwait(false);
 
-
 			// TODO: We might need to include more 400X codes
 			if (this.Configuration.AutoReconnect && (e.CloseCode < 4001 || e.CloseCode >= 5000))
 			{
@@ -205,22 +198,19 @@ async Task SocketOnDisconnect(IWebSocketClient sender, SocketCloseEventArgs e)
 
 				if (this._status == null)
 					await this.ConnectAsync().ConfigureAwait(false);
-				else
-					if (this._status.IdleSince.HasValue)
+				else if (this._status.IdleSince.HasValue)
 					await this.ConnectAsync(this._status.ActivityInternal, this._status.Status, Utilities.GetDateTimeOffsetFromMilliseconds(this._status.IdleSince.Value)).ConfigureAwait(false);
 				else
 					await this.ConnectAsync(this._status.ActivityInternal, this._status.Status).ConfigureAwait(false);
 			}
 			else
-			{
 				this.Logger.LogCritical(LoggerEvents.ConnectionClose, "Connection terminated ({0}, '{1}')", e.CloseCode, e.CloseMessage);
-			}
 		}
 	}
 
-	#endregion
+#endregion
 
-	#region WebSocket (Events)
+#region WebSocket (Events)
 
 	/// <summary>
 	/// Handles the socket message.
@@ -354,8 +344,7 @@ internal async Task OnHeartbeatAckAsync()
 
 		var args = new HeartbeatEventArgs(this.ServiceProvider)
 		{
-			Ping = this.Ping,
-			Timestamp = DateTimeOffset.Now
+			Ping = this.Ping, Timestamp = DateTimeOffset.Now
 		};
 
 		await this._heartbeated.InvokeAsync(this, args).ConfigureAwait(false);
@@ -380,9 +369,9 @@ internal async Task HeartbeatLoopAsync()
 		catch (OperationCanceledException) { }
 	}
 
-	#endregion
+#endregion
 
-	#region Internal Gateway Methods
+#region Internal Gateway Methods
 
 	/// <summary>
 	/// Updates the status.
@@ -400,18 +389,14 @@ internal async Task InternalUpdateStatusAsync(DiscordActivity activity, UserStat
 
 		var status = new StatusUpdate
 		{
-			Activity = new(act),
-			IdleSince = sinceUnix,
-			IsAfk = idleSince != null,
-			Status = userStatus ?? UserStatus.Online
+			Activity = new(act), IdleSince = sinceUnix, IsAfk = idleSince != null, Status = userStatus ?? UserStatus.Online
 		};
 
 		// Solution to have status persist between sessions
 		this._status = status;
 		var statusUpdate = new GatewayPayload
 		{
-			OpCode = GatewayOpCode.StatusUpdate,
-			Data = status
+			OpCode = GatewayOpCode.StatusUpdate, Data = status
 		};
 
 		var statusstr = JsonConvert.SerializeObject(statusUpdate);
@@ -419,15 +404,16 @@ internal async Task InternalUpdateStatusAsync(DiscordActivity activity, UserStat
 		await this.WsSendAsync(statusstr).ConfigureAwait(false);
 
 		if (!this.PresencesInternal.ContainsKey(this.CurrentUser.Id))
-		{
 			this.PresencesInternal[this.CurrentUser.Id] = new()
 			{
 				Discord = this,
 				Activity = act,
 				Status = userStatus ?? UserStatus.Online,
-				InternalUser = new() { Id = this.CurrentUser.Id }
+				InternalUser = new()
+				{
+					Id = this.CurrentUser.Id
+				}
 			};
-		}
 		else
 		{
 			var pr = this.PresencesInternal[this.CurrentUser.Id];
@@ -450,8 +436,7 @@ internal async Task SendHeartbeatAsync(long seq)
 
 			var args = new ZombiedEventArgs(this.ServiceProvider)
 			{
-				Failures = Volatile.Read(ref this._skippedHeartbeats),
-				GuildDownloadCompleted = true
+				Failures = Volatile.Read(ref this._skippedHeartbeats), GuildDownloadCompleted = true
 			};
 			await this._zombied.InvokeAsync(this, args).ConfigureAwait(false);
 
@@ -462,8 +447,7 @@ internal async Task SendHeartbeatAsync(long seq)
 		{
 			var args = new ZombiedEventArgs(this.ServiceProvider)
 			{
-				Failures = Volatile.Read(ref this._skippedHeartbeats),
-				GuildDownloadCompleted = false
+				Failures = Volatile.Read(ref this._skippedHeartbeats), GuildDownloadCompleted = false
 			};
 			await this._zombied.InvokeAsync(this, args).ConfigureAwait(false);
 
@@ -474,8 +458,7 @@ internal async Task SendHeartbeatAsync(long seq)
 		this.Logger.LogTrace(LoggerEvents.Heartbeat, "Sending heartbeat");
 		var heartbeat = new GatewayPayload
 		{
-			OpCode = GatewayOpCode.Heartbeat,
-			Data = seq
+			OpCode = GatewayOpCode.Heartbeat, Data = seq
 		};
 		var heartbeatStr = JsonConvert.SerializeObject(heartbeat);
 		await this.WsSendAsync(heartbeatStr).ConfigureAwait(false);
@@ -498,8 +481,7 @@ internal async Task SendIdentifyAsync(StatusUpdate status)
 			LargeThreshold = this.Configuration.LargeThreshold,
 			ShardInfo = new()
 			{
-				ShardId = this.Configuration.ShardId,
-				ShardCount = this.Configuration.ShardCount
+				ShardId = this.Configuration.ShardId, ShardCount = this.Configuration.ShardCount
 			},
 			Presence = status,
 			Intents = this.Configuration.Intents,
@@ -507,8 +489,7 @@ internal async Task SendIdentifyAsync(StatusUpdate status)
 		};
 		var payload = new GatewayPayload
 		{
-			OpCode = GatewayOpCode.Identify,
-			Data = identify
+			OpCode = GatewayOpCode.Identify, Data = identify
 		};
 		var payloadstr = JsonConvert.SerializeObject(payload);
 		await this.WsSendAsync(payloadstr).ConfigureAwait(false);
@@ -523,20 +504,18 @@ internal async Task SendResumeAsync()
 	{
 		var resume = new GatewayResume
 		{
-			Token = Utilities.GetFormattedToken(this),
-			SessionId = this._sessionId,
-			SequenceNumber = Volatile.Read(ref this._lastSequence)
+			Token = Utilities.GetFormattedToken(this), SessionId = this._sessionId, SequenceNumber = Volatile.Read(ref this._lastSequence)
 		};
 		var resumePayload = new GatewayPayload
 		{
-			OpCode = GatewayOpCode.Resume,
-			Data = resume
+			OpCode = GatewayOpCode.Resume, Data = resume
 		};
 		var resumestr = JsonConvert.SerializeObject(resumePayload);
 		this.GatewayUri = new(this._resumeGatewayUrl);
 		this.Logger.LogDebug(LoggerEvents.ConnectionClose, "Request to resume via {gw}", this.GatewayUri.AbsoluteUri);
 		await this.WsSendAsync(resumestr).ConfigureAwait(false);
 	}
+
 	/// <summary>
 	/// Internals the update gateway async.
 	/// </summary>
@@ -558,9 +537,9 @@ internal async Task WsSendAsync(string payload)
 		await this.WebSocketClient.SendMessageAsync(payload).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Semaphore Methods
+#region Semaphore Methods
 
 	/// <summary>
 	/// Gets the socket lock.
@@ -569,5 +548,5 @@ internal async Task WsSendAsync(string payload)
 	private SocketLock GetSocketLock()
 		=> s_socketLocks.GetOrAdd(this.CurrentApplication.Id, appId => new(appId, this.GatewayInfo.SessionBucket.MaxConcurrency));
 
-	#endregion
+#endregion
 }
diff --git a/DisCatSharp/Clients/DiscordClient.cs b/DisCatSharp/Clients/DiscordClient.cs
index 51b7470142..da031fbf96 100644
--- a/DisCatSharp/Clients/DiscordClient.cs
+++ b/DisCatSharp/Clients/DiscordClient.cs
@@ -30,7 +30,7 @@ namespace DisCatSharp;
 /// </summary>
 public sealed partial class DiscordClient : BaseDiscordClient
 {
-	#region Internal Fields/Properties
+#region Internal Fields/Properties
 
 	internal bool IsShard = false;
 
@@ -47,9 +47,10 @@ public sealed partial class DiscordClient : BaseDiscordClient
 	/// </summary>
 	private readonly ManualResetEventSlim _connectionLock = new(true);
 
-	#endregion
+#endregion
+
+#region Public Fields/Properties
 
-	#region Public Fields/Properties
 	/// <summary>
 	/// Gets the gateway protocol version.
 	/// </summary>
@@ -90,6 +91,7 @@ public DiscordIntents Intents
 	/// <see cref="GuildAvailable"/> or <see cref="GuildDownloadCompleted"/> events haven't been fired yet)
 	/// </summary>
 	public override IReadOnlyDictionary<ulong, DiscordGuild> Guilds { get; }
+
 	internal ConcurrentDictionary<ulong, DiscordGuild> GuildsInternal = new();
 
 	/// <summary>
@@ -117,9 +119,10 @@ public IReadOnlyDictionary<string, DiscordActivity> EmbeddedActivities
 
 	internal Dictionary<string, DiscordActivity> EmbeddedActivitiesInternal = new();
 	private Lazy<IReadOnlyDictionary<string, DiscordActivity>> _embeddedActivitiesLazy;
-	#endregion
 
-	#region Constructor/Internal Setup
+#endregion
+
+#region Constructor/Internal Setup
 
 	/// <summary>
 	/// Initializes a new instance of <see cref="DiscordClient"/>.
@@ -132,8 +135,8 @@ public DiscordClient(DiscordConfiguration config)
 		{
 			var intents = this.Configuration.Intents;
 			this.MessageCache = intents.HasIntent(DiscordIntents.GuildMessages) || intents.HasIntent(DiscordIntents.DirectMessages)
-					? new RingBuffer<DiscordMessage>(this.Configuration.MessageCacheSize)
-					: null;
+				? new RingBuffer<DiscordMessage>(this.Configuration.MessageCacheSize)
+				: null;
 		}
 
 		this.InternalSetup();
@@ -243,9 +246,9 @@ internal void InternalSetup()
 		this._embeddedActivitiesLazy = new(() => new ReadOnlyDictionary<string, DiscordActivity>(this.EmbeddedActivitiesInternal));
 	}
 
-	#endregion
+#endregion
 
-	#region Client Extension Methods
+#region Client Extension Methods
 
 	/// <summary>
 	/// Registers an extension with this client.
@@ -265,9 +268,9 @@ public void AddExtension(BaseExtension ext)
 	public T GetExtension<T>() where T : BaseExtension
 		=> this._extensions.FirstOrDefault(x => x.GetType() == typeof(T)) as T;
 
-	#endregion
+#endregion
 
-	#region Public Connection Methods
+#region Public Connection Methods
 
 	/// <summary>
 	/// Connects to the gateway.
@@ -283,6 +286,7 @@ public async Task ConnectAsync(DiscordActivity activity = null, UserStatus? stat
 		// Check if connection lock is already set, and set it if it isn't
 		if (!this._connectionLock.Wait(0))
 			throw new InvalidOperationException("This client is already connected.");
+
 		this._connectionLock.Set();
 
 		var w = 7500;
@@ -313,7 +317,6 @@ public async Task ConnectAsync(DiscordActivity activity = null, UserStatus? stat
 		}
 
 		while (i-- > 0 || this.Configuration.ReconnectIndefinitely)
-		{
 			try
 			{
 				await this.InternalConnectAsync().ConfigureAwait(false);
@@ -348,7 +351,6 @@ public async Task ConnectAsync(DiscordActivity activity = null, UserStatus? stat
 				if (i > 0)
 					w *= 2;
 			}
-		}
 
 		if (!s && cex != null)
 		{
@@ -377,7 +379,7 @@ static void FailConnection(ManualResetEventSlim cl) =>
 	/// </summary>
 	/// <param name="startNewSession">Whether to start a new session.</param>
 	public Task ReconnectAsync(bool startNewSession = true)
-		=> this.InternalReconnectAsync(startNewSession, code: startNewSession ? 1000 : 4002);
+		=> this.InternalReconnectAsync(startNewSession, startNewSession ? 1000 : 4002);
 
 	/// <summary>
 	/// Disconnects from the gateway.
@@ -389,9 +391,9 @@ public async Task DisconnectAsync()
 			await this.WebSocketClient.DisconnectAsync().ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Public REST Methods
+#region Public REST Methods
 
 	/// <summary>
 	/// Gets a user.
@@ -549,14 +551,14 @@ public async Task DeleteTestEntitlementsAsync(ulong entitlementId)
 	/// </summary>
 	/// <returns>A list of metadata records or <see langword="null"/>.</returns>
 	public async Task<IReadOnlyList<DiscordApplicationRoleConnectionMetadata>> GetRoleConnectionMetadata()
-		 => await this.ApiClient.GetRoleConnectionMetadataRecords(this.CurrentApplication.Id).ConfigureAwait(false);
+		=> await this.ApiClient.GetRoleConnectionMetadataRecords(this.CurrentApplication.Id).ConfigureAwait(false);
 
 	/// <summary>
 	/// Updates the applications role connection metadata.
 	/// </summary>
 	/// <param name="metadata">A list of metadata objects. Max 5.</param>
 	public async Task<IReadOnlyList<DiscordApplicationRoleConnectionMetadata>> UpdateRoleConnectionMetadata(IEnumerable<DiscordApplicationRoleConnectionMetadata> metadata)
-		 => await this.ApiClient.UpdateRoleConnectionMetadataRecords(this.CurrentApplication.Id, metadata).ConfigureAwait(false);
+		=> await this.ApiClient.UpdateRoleConnectionMetadataRecords(this.CurrentApplication.Id, metadata).ConfigureAwait(false);
 
 	/// <summary>
 	/// Removes all global application commands.
@@ -655,7 +657,7 @@ public bool TryGetThread(ulong id, out DiscordThreadChannel thread, bool fetch =
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public Task<DiscordMessage> SendMessageAsync(DiscordChannel channel, string content)
-		=> this.ApiClient.CreateMessageAsync(channel.Id, content, embeds: null, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
+		=> this.ApiClient.CreateMessageAsync(channel.Id, content, null, null, null, false, false);
 
 	/// <summary>
 	/// Sends a message with an embed.
@@ -668,7 +670,12 @@ public Task<DiscordMessage> SendMessageAsync(DiscordChannel channel, string cont
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public Task<DiscordMessage> SendMessageAsync(DiscordChannel channel, DiscordEmbed embed)
-		=> this.ApiClient.CreateMessageAsync(channel.Id, null, embed != null ? new[] { embed } : null, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
+		=> this.ApiClient.CreateMessageAsync(channel.Id, null, embed != null
+			? new[]
+			{
+				embed
+			}
+			: null, null, null, false, false);
 
 	/// <summary>
 	/// Sends a message with content and an embed.
@@ -682,7 +689,12 @@ public Task<DiscordMessage> SendMessageAsync(DiscordChannel channel, DiscordEmbe
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public Task<DiscordMessage> SendMessageAsync(DiscordChannel channel, string content, DiscordEmbed embed)
-		=> this.ApiClient.CreateMessageAsync(channel.Id, content, embed != null ? new[] { embed } : null, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
+		=> this.ApiClient.CreateMessageAsync(channel.Id, content, embed != null
+			? new[]
+			{
+				embed
+			}
+			: null, null, null, false, false);
 
 	/// <summary>
 	/// Sends a message with the <see cref="DisCatSharp.Entities.DiscordMessageBuilder"/>.
@@ -728,8 +740,14 @@ public Task<DiscordMessage> SendMessageAsync(DiscordChannel channel, Action<Disc
 	/// <exception cref="NotFoundException">Thrown when the channel does not exist.</exception>
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
-	public Task<DiscordGuild> CreateGuildAsync(string name, string region = null, Optional<Stream> icon = default, VerificationLevel? verificationLevel = null,
-		DefaultMessageNotifications? defaultMessageNotifications = null, SystemChannelFlags? systemChannelFlags = null)
+	public Task<DiscordGuild> CreateGuildAsync(
+		string name,
+		string region = null,
+		Optional<Stream> icon = default,
+		VerificationLevel? verificationLevel = null,
+		DefaultMessageNotifications? defaultMessageNotifications = null,
+		SystemChannelFlags? systemChannelFlags = null
+	)
 	{
 		var iconb64 = ImageTool.Base64FromStream(icon);
 		return this.ApiClient.CreateGuildAsync(name, region, iconb64, verificationLevel, defaultMessageNotifications, systemChannelFlags);
@@ -992,6 +1010,7 @@ public Uri GenerateInAppOauthFor(DiscordUser bot, Permissions permissions = Perm
 	{
 		if (!bot.IsBot)
 			throw new ArgumentException("The user must be a bot.", nameof(bot));
+
 		permissions &= PermissionMethods.FullPerms;
 		return new(new QueryUriBuilder($"{DiscordDomain.GetDomain(CoreDomain.Discord).Url}{Endpoints.OAUTH2}{Endpoints.AUTHORIZE}")
 			.AddParameter("client_id", bot.Id.ToString(CultureInfo.InvariantCulture))
@@ -1199,7 +1218,7 @@ public Task<DiscordApplicationCommand> CreateGuildApplicationCommandAsync(ulong
 	/// <param name="commandId">The id of the command to get.</param>
 	/// <returns>The command with the id.</returns>
 	public Task<DiscordApplicationCommand> GetGuildApplicationCommandAsync(ulong guildId, ulong commandId) =>
-		 this.ApiClient.GetGuildApplicationCommandAsync(this.CurrentApplication.Id, guildId, commandId);
+		this.ApiClient.GetGuildApplicationCommandAsync(this.CurrentApplication.Id, guildId, commandId);
 
 	/// <summary>
 	/// Edits a application command in a guild.
@@ -1241,9 +1260,10 @@ public Task<IReadOnlyList<DiscordGuildApplicationCommandPermission>> GetGuildApp
 	public Task<DiscordGuildApplicationCommandPermission> GetApplicationCommandPermissionAsync(ulong guildId, ulong commandId)
 		=> null;
 
-	#endregion
+#endregion
+
+#region Internal Caching Methods
 
-	#region Internal Caching Methods
 	/// <summary>
 	/// Gets the internal cached threads.
 	/// </summary>
@@ -1261,7 +1281,6 @@ internal DiscordThreadChannel InternalGetCachedThread(ulong threadId)
 		return null;
 	}
 
-
 	/// <summary>
 	/// Gets the internal cached scheduled event.
 	/// </summary>
@@ -1309,10 +1328,8 @@ internal DiscordChannel InternalGetCachedChannel(ulong channelId, ulong? guildId
 	internal DiscordGuild InternalGetCachedGuild(ulong? guildId)
 	{
 		if (this.GuildsInternal != null && guildId.HasValue)
-		{
 			if (this.GuildsInternal.TryGetValue(guildId.Value, out var guild))
 				return guild;
-		}
 
 		return null;
 	}
@@ -1328,7 +1345,10 @@ private void UpdateMessage(DiscordMessage message, TransportUser author, Discord
 	{
 		if (author != null)
 		{
-			var usr = new DiscordUser(author) { Discord = this };
+			var usr = new DiscordUser(author)
+			{
+				Discord = this
+			};
 
 			if (member != null)
 				member.User = author;
@@ -1343,14 +1363,11 @@ private void UpdateMessage(DiscordMessage message, TransportUser author, Discord
 		channel = !message.GuildId.HasValue
 			? new DiscordDmChannel
 			{
-				Id = message.ChannelId,
-				Discord = this,
-				Type = ChannelType.Private
+				Id = message.ChannelId, Discord = this, Type = ChannelType.Private
 			}
 			: new DiscordChannel
 			{
-				Id = message.ChannelId,
-				Discord = this
+				Id = message.ChannelId, Discord = this
 			};
 
 		message.Channel = channel;
@@ -1365,7 +1382,6 @@ private void UpdateMessage(DiscordMessage message, TransportUser author, Discord
 	private DiscordScheduledEvent UpdateScheduledEvent(DiscordScheduledEvent scheduledEvent, DiscordGuild guild)
 	{
 		if (scheduledEvent != null)
-		{
 			_ = guild.ScheduledEventsInternal.AddOrUpdate(scheduledEvent.Id, scheduledEvent, (id, old) =>
 			{
 				old.Discord = this;
@@ -1381,7 +1397,6 @@ private DiscordScheduledEvent UpdateScheduledEvent(DiscordScheduledEvent schedul
 				old.ScheduledEndTimeRaw = scheduledEvent.ScheduledEndTimeRaw;
 				return old;
 			});
-		}
 
 		return scheduledEvent;
 	}
@@ -1400,7 +1415,10 @@ private DiscordUser UpdateUser(DiscordUser usr, ulong? guildId, DiscordGuild gui
 		{
 			if (mbr.User != null)
 			{
-				usr = new(mbr.User) { Discord = this };
+				usr = new(mbr.User)
+				{
+					Discord = this
+				};
 
 				_ = this.UserCache.AddOrUpdate(usr.Id, usr, (id, old) =>
 				{
@@ -1417,7 +1435,10 @@ private DiscordUser UpdateUser(DiscordUser usr, ulong? guildId, DiscordGuild gui
 					return old;
 				});
 
-				usr = new DiscordMember(mbr) { Discord = this, GuildId = guildId.Value };
+				usr = new DiscordMember(mbr)
+				{
+					Discord = this, GuildId = guildId.Value
+				};
 			}
 
 			var intents = this.Configuration.Intents;
@@ -1429,21 +1450,14 @@ private DiscordUser UpdateUser(DiscordUser usr, ulong? guildId, DiscordGuild gui
 				if (guild?.MembersInternal.TryGetValue(usr.Id, out member) == false)
 				{
 					if (intents.HasIntent(DiscordIntents.GuildMembers) || this.Configuration.AlwaysCacheMembers) // member can be updated by events, so cache it
-					{
 						guild.MembersInternal.TryAdd(usr.Id, (DiscordMember)usr);
-					}
 				}
 				else if (intents.HasIntent(DiscordIntents.GuildPresences) || this.Configuration.AlwaysCacheMembers) // we can attempt to update it if it's already in cache.
-				{
 					if (!intents.HasIntent(DiscordIntents.GuildMembers)) // no need to update if we already have the member events
-					{
 						_ = guild.MembersInternal.TryUpdate(usr.Id, (DiscordMember)usr, member);
-					}
-				}
 			}
 		}
 		else if (usr.Username != null) // check if not a skeleton user
-		{
 			_ = this.UserCache.AddOrUpdate(usr.Id, usr, (id, old) =>
 			{
 				old.Username = usr.Username;
@@ -1458,7 +1472,6 @@ private DiscordUser UpdateUser(DiscordUser usr, ulong? guildId, DiscordGuild gui
 				old.GlobalName = usr.GlobalName;
 				return old;
 			});
-		}
 
 		return usr;
 	}
@@ -1504,7 +1517,6 @@ private void UpdateCachedGuild(DiscordGuild newGuild, JArray rawMembers)
 		var guild = this.GuildsInternal[newGuild.Id];
 
 		if (newGuild.ChannelsInternal != null && !newGuild.ChannelsInternal.IsEmpty)
-		{
 			foreach (var channel in newGuild.ChannelsInternal.Values)
 			{
 				if (guild.ChannelsInternal.TryGetValue(channel.Id, out _)) continue;
@@ -1513,27 +1525,22 @@ private void UpdateCachedGuild(DiscordGuild newGuild, JArray rawMembers)
 
 				guild.ChannelsInternal[channel.Id] = channel;
 			}
-		}
 
 		if (newGuild.ThreadsInternal != null && !newGuild.ThreadsInternal.IsEmpty)
-		{
 			foreach (var thread in newGuild.ThreadsInternal.Values)
 			{
 				if (guild.ThreadsInternal.TryGetValue(thread.Id, out _)) continue;
 
 				guild.ThreadsInternal[thread.Id] = thread;
 			}
-		}
 
 		if (newGuild.ScheduledEventsInternal != null && !newGuild.ScheduledEventsInternal.IsEmpty)
-		{
 			foreach (var @event in newGuild.ScheduledEventsInternal.Values)
 			{
 				if (guild.ScheduledEventsInternal.TryGetValue(@event.Id, out _)) continue;
 
 				guild.ScheduledEventsInternal[@event.Id] = @event;
 			}
-		}
 
 		foreach (var newEmoji in newGuild.EmojisInternal.Values)
 			_ = guild.EmojisInternal.GetOrAdd(newEmoji.Id, _ => newEmoji);
@@ -1552,7 +1559,10 @@ private void UpdateCachedGuild(DiscordGuild newGuild, JArray rawMembers)
 			{
 				var xtm = xj.ToDiscordObject<TransportMember>();
 
-				var usr = new DiscordUser(xtm.User) { Discord = this };
+				var usr = new DiscordUser(xtm.User)
+				{
+					Discord = this
+				};
 				_ = this.UserCache.AddOrUpdate(xtm.User.Id, usr, (id, old) =>
 				{
 					old.Username = usr.Username;
@@ -1568,7 +1578,10 @@ private void UpdateCachedGuild(DiscordGuild newGuild, JArray rawMembers)
 					return old;
 				});
 
-				guild.MembersInternal[xtm.User.Id] = new(xtm) { Discord = this, GuildId = guild.Id };
+				guild.MembersInternal[xtm.User.Id] = new(xtm)
+				{
+					Discord = this, GuildId = guild.Id
+				};
 			}
 		}
 
@@ -1642,10 +1655,9 @@ private void PopulateMessageReactionsAndCache(DiscordMessage message, TransportU
 			this.MessageCache?.Add(message);
 	}
 
+#endregion
 
-	#endregion
-
-	#region Disposal
+#region Disposal
 
 	~DiscordClient()
 	{
@@ -1655,7 +1667,6 @@ private void PopulateMessageReactionsAndCache(DiscordMessage message, TransportU
 	/// <summary>
 	/// Whether the client is disposed.
 	/// </summary>
-
 	private bool _disposed;
 
 	/// <summary>
@@ -1693,5 +1704,5 @@ public override void Dispose()
 			SentrySdk.EndSession();
 	}
 
-	#endregion
+#endregion
 }
diff --git a/DisCatSharp/Clients/DiscordOAuth2Client.cs b/DisCatSharp/Clients/DiscordOAuth2Client.cs
index 1c257375ad..9ba42f007c 100644
--- a/DisCatSharp/Clients/DiscordOAuth2Client.cs
+++ b/DisCatSharp/Clients/DiscordOAuth2Client.cs
@@ -97,8 +97,18 @@ public string BotLibrary
 	/// <param name="loggerFactory">The optional logging factory to use for this client. Defaults to null.</param>
 	/// <param name="minimumLogLevel">The minimum logging level for messages. Defaults to information.</param>
 	/// <param name="logTimestampFormat">The timestamp format to use for the logger.</param>
-	public DiscordOAuth2Client(ulong clientId, string clientSecret, string redirectUri, IServiceProvider provider = null!, IWebProxy proxy = null!, TimeSpan? timeout = null, bool useRelativeRateLimit = true,
-		ILoggerFactory loggerFactory = null!, LogLevel minimumLogLevel = LogLevel.Information, string logTimestampFormat = "yyyy-MM-dd HH:mm:ss zzz")
+	public DiscordOAuth2Client(
+		ulong clientId,
+		string clientSecret,
+		string redirectUri,
+		IServiceProvider provider = null!,
+		IWebProxy proxy = null!,
+		TimeSpan? timeout = null,
+		bool useRelativeRateLimit = true,
+		ILoggerFactory loggerFactory = null!,
+		LogLevel minimumLogLevel = LogLevel.Information,
+		string logTimestampFormat = "yyyy-MM-dd HH:mm:ss zzz"
+	)
 	{
 		this.MinimumLogLevel = minimumLogLevel;
 		this.LogTimestampFormat = logTimestampFormat;
@@ -119,7 +129,6 @@ public DiscordOAuth2Client(ulong clientId, string clientSecret, string redirectU
 
 		this.ApiClient = new(this, proxy!, parsedTimeout, useRelativeRateLimit, this.Logger);
 
-
 		this.ApiClient.Rest.HttpClient.DefaultRequestHeaders.TryAddWithoutValidation("client_id", this.ClientId.ToString());
 		this.ApiClient.Rest.HttpClient.DefaultRequestHeaders.TryAddWithoutValidation("client_secret", this.ClientSecret);
 
@@ -197,9 +206,9 @@ public bool ValidateState(Uri requestUrl, Uri responseUrl, bool secure = false)
 		var responseState = responseQueryDictionary.GetValues("state")?.First();
 		if (!secure)
 			return requestState is not null && responseState is not null &&
-				   int.Parse(requestState.Split("::")[1]) == this.ClientId.GetHashCode() &&
-				   int.Parse(responseState.Split("::")[1]) == this.ClientId.GetHashCode() &&
-				   requestState == responseState;
+			       int.Parse(requestState.Split("::")[1]) == this.ClientId.GetHashCode() &&
+			       int.Parse(responseState.Split("::")[1]) == this.ClientId.GetHashCode() &&
+			       requestState == responseState;
 
 		if (requestState is null || responseState is null)
 			throw new NullReferenceException("State was null");
@@ -314,7 +323,6 @@ public Task<DiscordApplicationRoleConnection> GetCurrentUserApplicationRoleConne
 	public Task UpdateCurrentUserApplicationRoleConnectionAsync(DiscordAccessToken accessToken, string platformName, string platformUsername, ApplicationRoleConnectionMetadata metadata)
 		=> accessToken.Scope.Split(' ').Any(x => x == "role_connections.write") ? this.ApiClient.ModifyCurrentUserApplicationRoleConnectionAsync(accessToken.AccessToken, platformName, platformUsername, metadata) : throw new AccessViolationException("Access token does not include role_connections.write scope");
 
-
 	/// <summary>
 	/// Fired whenever an error occurs within an event handler.
 	/// </summary>
@@ -347,7 +355,10 @@ internal void EventErrorHandler<TSender, TArgs>(AsyncEvent<TSender, TArgs> async
 		}
 
 		this.Logger.LogError(LoggerEvents.EventHandlerException, ex, "Event handler exception for event {Name} thrown from {Method} (defined in {Type})", asyncEvent.Name, handler.Method, handler.Method.DeclaringType);
-		this.OAuth2ClientErroredInternal.InvokeAsync(this, new(this.ServiceProvider) { EventName = asyncEvent.Name, Exception = ex }).ConfigureAwait(false).GetAwaiter().GetResult();
+		this.OAuth2ClientErroredInternal.InvokeAsync(this, new(this.ServiceProvider)
+		{
+			EventName = asyncEvent.Name, Exception = ex
+		}).ConfigureAwait(false).GetAwaiter().GetResult();
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Clients/DiscordShardedClient.Events.cs b/DisCatSharp/Clients/DiscordShardedClient.Events.cs
index 633cdd3b9f..3dd56bc8ad 100644
--- a/DisCatSharp/Clients/DiscordShardedClient.Events.cs
+++ b/DisCatSharp/Clients/DiscordShardedClient.Events.cs
@@ -14,7 +14,7 @@ namespace DisCatSharp;
 /// </summary>
 public sealed partial class DiscordShardedClient
 {
-	#region WebSocket
+#region WebSocket
 
 	/// <summary>
 	/// Fired whenever a WebSocket error occurs within the client.
@@ -24,6 +24,7 @@ public event AsyncEventHandler<DiscordClient, SocketErrorEventArgs> SocketErrore
 		add => this._socketErrored.Register(value);
 		remove => this._socketErrored.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, SocketErrorEventArgs> _socketErrored;
 
 	/// <summary>
@@ -34,6 +35,7 @@ public event AsyncEventHandler<DiscordClient, SocketEventArgs> SocketOpened
 		add => this._socketOpened.Register(value);
 		remove => this._socketOpened.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, SocketEventArgs> _socketOpened;
 
 	/// <summary>
@@ -44,6 +46,7 @@ public event AsyncEventHandler<DiscordClient, SocketCloseEventArgs> SocketClosed
 		add => this._socketClosed.Register(value);
 		remove => this._socketClosed.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, SocketCloseEventArgs> _socketClosed;
 
 	/// <summary>
@@ -54,6 +57,7 @@ public event AsyncEventHandler<DiscordClient, ReadyEventArgs> Ready
 		add => this._ready.Register(value);
 		remove => this._ready.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ReadyEventArgs> _ready;
 
 	/// <summary>
@@ -64,6 +68,7 @@ public event AsyncEventHandler<DiscordClient, ReadyEventArgs> Resumed
 		add => this._resumed.Register(value);
 		remove => this._resumed.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ReadyEventArgs> _resumed;
 
 	/// <summary>
@@ -74,11 +79,12 @@ public event AsyncEventHandler<DiscordClient, HeartbeatEventArgs> Heartbeated
 		add => this._heartbeated.Register(value);
 		remove => this._heartbeated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, HeartbeatEventArgs> _heartbeated;
 
-	#endregion
+#endregion
 
-	#region Channel
+#region Channel
 
 	/// <summary>
 	/// Fired when a new channel is created.
@@ -89,6 +95,7 @@ public event AsyncEventHandler<DiscordClient, ChannelCreateEventArgs> ChannelCre
 		add => this._channelCreated.Register(value);
 		remove => this._channelCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ChannelCreateEventArgs> _channelCreated;
 
 	/// <summary>
@@ -100,6 +107,7 @@ public event AsyncEventHandler<DiscordClient, ChannelUpdateEventArgs> ChannelUpd
 		add => this._channelUpdated.Register(value);
 		remove => this._channelUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ChannelUpdateEventArgs> _channelUpdated;
 
 	/// <summary>
@@ -111,6 +119,7 @@ public event AsyncEventHandler<DiscordClient, ChannelDeleteEventArgs> ChannelDel
 		add => this._channelDeleted.Register(value);
 		remove => this._channelDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ChannelDeleteEventArgs> _channelDeleted;
 
 	/// <summary>
@@ -122,6 +131,7 @@ public event AsyncEventHandler<DiscordClient, DmChannelDeleteEventArgs> DmChanne
 		add => this._dmChannelDeleted.Register(value);
 		remove => this._dmChannelDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, DmChannelDeleteEventArgs> _dmChannelDeleted;
 
 	/// <summary>
@@ -133,6 +143,7 @@ public event AsyncEventHandler<DiscordClient, ChannelPinsUpdateEventArgs> Channe
 		add => this._channelPinsUpdated.Register(value);
 		remove => this._channelPinsUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ChannelPinsUpdateEventArgs> _channelPinsUpdated;
 
 	/// <summary>
@@ -144,11 +155,12 @@ public event AsyncEventHandler<DiscordClient, VoiceChannelStatusUpdateEventArgs>
 		add => this._voiceChannelStatusUpdated.Register(value);
 		remove => this._voiceChannelStatusUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, VoiceChannelStatusUpdateEventArgs> _voiceChannelStatusUpdated;
 
-	#endregion
+#endregion
 
-	#region Guild
+#region Guild
 
 	/// <summary>
 	/// Fired when the user joins a new guild.
@@ -160,6 +172,7 @@ public event AsyncEventHandler<DiscordClient, GuildCreateEventArgs> GuildCreated
 		add => this._guildCreated.Register(value);
 		remove => this._guildCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildCreateEventArgs> _guildCreated;
 
 	/// <summary>
@@ -170,6 +183,7 @@ public event AsyncEventHandler<DiscordClient, GuildCreateEventArgs> GuildAvailab
 		add => this._guildAvailable.Register(value);
 		remove => this._guildAvailable.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildCreateEventArgs> _guildAvailable;
 
 	/// <summary>
@@ -181,6 +195,7 @@ public event AsyncEventHandler<DiscordClient, GuildUpdateEventArgs> GuildUpdated
 		add => this._guildUpdated.Register(value);
 		remove => this._guildUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildUpdateEventArgs> _guildUpdated;
 
 	/// <summary>
@@ -192,6 +207,7 @@ public event AsyncEventHandler<DiscordClient, GuildDeleteEventArgs> GuildDeleted
 		add => this._guildDeleted.Register(value);
 		remove => this._guildDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildDeleteEventArgs> _guildDeleted;
 
 	/// <summary>
@@ -202,6 +218,7 @@ public event AsyncEventHandler<DiscordClient, GuildDeleteEventArgs> GuildUnavail
 		add => this._guildUnavailable.Register(value);
 		remove => this._guildUnavailable.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildDeleteEventArgs> _guildUnavailable;
 
 	/// <summary>
@@ -212,6 +229,7 @@ public event AsyncEventHandler<DiscordClient, GuildDownloadCompletedEventArgs> G
 		add => this._guildDownloadCompleted.Register(value);
 		remove => this._guildDownloadCompleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildDownloadCompletedEventArgs> _guildDownloadCompleted;
 
 	/// <summary>
@@ -223,6 +241,7 @@ public event AsyncEventHandler<DiscordClient, GuildEmojisUpdateEventArgs> GuildE
 		add => this._guildEmojisUpdated.Register(value);
 		remove => this._guildEmojisUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildEmojisUpdateEventArgs> _guildEmojisUpdated;
 
 	/// <summary>
@@ -234,6 +253,7 @@ public event AsyncEventHandler<DiscordClient, GuildStickersUpdateEventArgs> Guil
 		add => this._guildStickersUpdated.Register(value);
 		remove => this._guildStickersUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildStickersUpdateEventArgs> _guildStickersUpdated;
 
 	/// <summary>
@@ -244,11 +264,13 @@ public event AsyncEventHandler<DiscordClient, GuildIntegrationsUpdateEventArgs>
 		add => this._guildIntegrationsUpdated.Register(value);
 		remove => this._guildIntegrationsUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildIntegrationsUpdateEventArgs> _guildIntegrationsUpdated;
 
-	#endregion
+#endregion
+
+#region Automod
 
-	#region Automod
 	/// <summary>
 	/// Fired when an auto mod rule gets created.
 	/// </summary>
@@ -257,6 +279,7 @@ public event AsyncEventHandler<DiscordClient, AutomodRuleCreateEventArgs> Automo
 		add => this._automodRuleCreated.Register(value);
 		remove => this._automodRuleCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, AutomodRuleCreateEventArgs> _automodRuleCreated;
 
 	/// <summary>
@@ -267,6 +290,7 @@ public event AsyncEventHandler<DiscordClient, AutomodRuleUpdateEventArgs> Automo
 		add => this._automodRuleUpdated.Register(value);
 		remove => this._automodRuleUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, AutomodRuleUpdateEventArgs> _automodRuleUpdated;
 
 	/// <summary>
@@ -277,6 +301,7 @@ public event AsyncEventHandler<DiscordClient, AutomodRuleDeleteEventArgs> Automo
 		add => this._automodRuleDeleted.Register(value);
 		remove => this._automodRuleDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, AutomodRuleDeleteEventArgs> _automodRuleDeleted;
 
 	/// <summary>
@@ -287,6 +312,7 @@ public event AsyncEventHandler<DiscordClient, AutomodActionExecutedEventArgs> Au
 		add => this._automodActionExecuted.Register(value);
 		remove => this._automodActionExecuted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, AutomodActionExecutedEventArgs> _automodActionExecuted;
 
 	/// <summary>
@@ -297,10 +323,12 @@ public event AsyncEventHandler<DiscordClient, GuildAuditLogEntryCreateEventArgs>
 		add => this._guildAuditLogEntryCreated.Register(value);
 		remove => this._guildAuditLogEntryCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildAuditLogEntryCreateEventArgs> _guildAuditLogEntryCreated;
-	#endregion
 
-	#region Guild Ban
+#endregion
+
+#region Guild Ban
 
 	/// <summary>
 	/// Fired when a guild ban gets added
@@ -311,6 +339,7 @@ public event AsyncEventHandler<DiscordClient, GuildBanAddEventArgs> GuildBanAdde
 		add => this._guildBanAdded.Register(value);
 		remove => this._guildBanAdded.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildBanAddEventArgs> _guildBanAdded;
 
 	/// <summary>
@@ -322,11 +351,12 @@ public event AsyncEventHandler<DiscordClient, GuildBanRemoveEventArgs> GuildBanR
 		add => this._guildBanRemoved.Register(value);
 		remove => this._guildBanRemoved.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildBanRemoveEventArgs> _guildBanRemoved;
 
-	#endregion
+#endregion
 
-	#region Guild Timeout
+#region Guild Timeout
 
 	/// <summary>
 	/// Fired when a guild member timeout gets added.
@@ -337,6 +367,7 @@ public event AsyncEventHandler<DiscordClient, GuildMemberTimeoutAddEventArgs> Gu
 		add => this._guildMemberTimeoutAdded.Register(value);
 		remove => this._guildMemberTimeoutAdded.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMemberTimeoutAddEventArgs> _guildMemberTimeoutAdded;
 
 	/// <summary>
@@ -348,8 +379,8 @@ public event AsyncEventHandler<DiscordClient, GuildMemberTimeoutUpdateEventArgs>
 		add => this._guildMemberTimeoutChanged.Register(value);
 		remove => this._guildMemberTimeoutChanged.Unregister(value);
 	}
-	private AsyncEvent<DiscordClient, GuildMemberTimeoutUpdateEventArgs> _guildMemberTimeoutChanged;
 
+	private AsyncEvent<DiscordClient, GuildMemberTimeoutUpdateEventArgs> _guildMemberTimeoutChanged;
 
 	/// <summary>
 	/// Fired when a guild member timeout gets removed.
@@ -360,11 +391,12 @@ public event AsyncEventHandler<DiscordClient, GuildMemberTimeoutRemoveEventArgs>
 		add => this._guildMemberTimeoutRemoved.Register(value);
 		remove => this._guildMemberTimeoutRemoved.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMemberTimeoutRemoveEventArgs> _guildMemberTimeoutRemoved;
 
-	#endregion
+#endregion
 
-	#region Guild Event
+#region Guild Event
 
 	/// <summary>
 	/// Fired when a scheduled event is created.
@@ -375,6 +407,7 @@ public event AsyncEventHandler<DiscordClient, GuildScheduledEventCreateEventArgs
 		add => this._guildScheduledEventCreated.Register(value);
 		remove => this._guildScheduledEventCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildScheduledEventCreateEventArgs> _guildScheduledEventCreated;
 
 	/// <summary>
@@ -386,6 +419,7 @@ public event AsyncEventHandler<DiscordClient, GuildScheduledEventUpdateEventArgs
 		add => this._guildScheduledEventUpdated.Register(value);
 		remove => this._guildScheduledEventUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildScheduledEventUpdateEventArgs> _guildScheduledEventUpdated;
 
 	/// <summary>
@@ -397,6 +431,7 @@ public event AsyncEventHandler<DiscordClient, GuildScheduledEventDeleteEventArgs
 		add => this._guildScheduledEventDeleted.Register(value);
 		remove => this._guildScheduledEventDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildScheduledEventDeleteEventArgs> _guildScheduledEventDeleted;
 
 	/// <summary>
@@ -408,6 +443,7 @@ public event AsyncEventHandler<DiscordClient, GuildScheduledEventUserAddEventArg
 		add => this._guildScheduledEventUserAdded.Register(value);
 		remove => this._guildScheduledEventUserAdded.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildScheduledEventUserAddEventArgs> _guildScheduledEventUserAdded;
 
 	/// <summary>
@@ -419,11 +455,12 @@ public event AsyncEventHandler<DiscordClient, GuildScheduledEventUserRemoveEvent
 		add => this._guildScheduledEventUserRemoved.Register(value);
 		remove => this._guildScheduledEventUserRemoved.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildScheduledEventUserRemoveEventArgs> _guildScheduledEventUserRemoved;
 
-	#endregion
+#endregion
 
-	#region Guild Integration
+#region Guild Integration
 
 	/// <summary>
 	/// Fired when a guild integration is created.
@@ -434,6 +471,7 @@ public event AsyncEventHandler<DiscordClient, GuildIntegrationCreateEventArgs> G
 		add => this._guildIntegrationCreated.Register(value);
 		remove => this._guildIntegrationCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildIntegrationCreateEventArgs> _guildIntegrationCreated;
 
 	/// <summary>
@@ -445,6 +483,7 @@ public event AsyncEventHandler<DiscordClient, GuildIntegrationUpdateEventArgs> G
 		add => this._guildIntegrationUpdated.Register(value);
 		remove => this._guildIntegrationUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildIntegrationUpdateEventArgs> _guildIntegrationUpdated;
 
 	/// <summary>
@@ -456,11 +495,12 @@ public event AsyncEventHandler<DiscordClient, GuildIntegrationDeleteEventArgs> G
 		add => this._guildIntegrationDeleted.Register(value);
 		remove => this._guildIntegrationDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildIntegrationDeleteEventArgs> _guildIntegrationDeleted;
 
-	#endregion
+#endregion
 
-	#region Guild Member
+#region Guild Member
 
 	/// <summary>
 	/// Fired when a new user joins a guild.
@@ -471,6 +511,7 @@ public event AsyncEventHandler<DiscordClient, GuildMemberAddEventArgs> GuildMemb
 		add => this._guildMemberAdded.Register(value);
 		remove => this._guildMemberAdded.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMemberAddEventArgs> _guildMemberAdded;
 
 	/// <summary>
@@ -482,6 +523,7 @@ public event AsyncEventHandler<DiscordClient, GuildMemberRemoveEventArgs> GuildM
 		add => this._guildMemberRemoved.Register(value);
 		remove => this._guildMemberRemoved.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMemberRemoveEventArgs> _guildMemberRemoved;
 
 	/// <summary>
@@ -493,6 +535,7 @@ public event AsyncEventHandler<DiscordClient, GuildMemberUpdateEventArgs> GuildM
 		add => this._guildMemberUpdated.Register(value);
 		remove => this._guildMemberUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMemberUpdateEventArgs> _guildMemberUpdated;
 
 	/// <summary>
@@ -503,11 +546,12 @@ public event AsyncEventHandler<DiscordClient, GuildMembersChunkEventArgs> GuildM
 		add => this._guildMembersChunk.Register(value);
 		remove => this._guildMembersChunk.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildMembersChunkEventArgs> _guildMembersChunk;
 
-	#endregion
+#endregion
 
-	#region Guild Role
+#region Guild Role
 
 	/// <summary>
 	/// Fired when a guild role is created.
@@ -518,6 +562,7 @@ public event AsyncEventHandler<DiscordClient, GuildRoleCreateEventArgs> GuildRol
 		add => this._guildRoleCreated.Register(value);
 		remove => this._guildRoleCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildRoleCreateEventArgs> _guildRoleCreated;
 
 	/// <summary>
@@ -529,6 +574,7 @@ public event AsyncEventHandler<DiscordClient, GuildRoleUpdateEventArgs> GuildRol
 		add => this._guildRoleUpdated.Register(value);
 		remove => this._guildRoleUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildRoleUpdateEventArgs> _guildRoleUpdated;
 
 	/// <summary>
@@ -540,11 +586,12 @@ public event AsyncEventHandler<DiscordClient, GuildRoleDeleteEventArgs> GuildRol
 		add => this._guildRoleDeleted.Register(value);
 		remove => this._guildRoleDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildRoleDeleteEventArgs> _guildRoleDeleted;
 
-	#endregion
+#endregion
 
-	#region Invite
+#region Invite
 
 	/// <summary>
 	/// Fired when an invite is created.
@@ -555,6 +602,7 @@ public event AsyncEventHandler<DiscordClient, InviteCreateEventArgs> InviteCreat
 		add => this._inviteCreated.Register(value);
 		remove => this._inviteCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, InviteCreateEventArgs> _inviteCreated;
 
 	/// <summary>
@@ -566,11 +614,12 @@ public event AsyncEventHandler<DiscordClient, InviteDeleteEventArgs> InviteDelet
 		add => this._inviteDeleted.Register(value);
 		remove => this._inviteDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, InviteDeleteEventArgs> _inviteDeleted;
 
-	#endregion
+#endregion
 
-	#region Message
+#region Message
 
 	/// <summary>
 	/// Fired when a message is created.
@@ -581,6 +630,7 @@ public event AsyncEventHandler<DiscordClient, MessageCreateEventArgs> MessageCre
 		add => this._messageCreated.Register(value);
 		remove => this._messageCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageCreateEventArgs> _messageCreated;
 
 	/// <summary>
@@ -592,6 +642,7 @@ public event AsyncEventHandler<DiscordClient, MessageUpdateEventArgs> MessageUpd
 		add => this._messageUpdated.Register(value);
 		remove => this._messageUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageUpdateEventArgs> _messageUpdated;
 
 	/// <summary>
@@ -603,6 +654,7 @@ public event AsyncEventHandler<DiscordClient, MessageDeleteEventArgs> MessageDel
 		add => this._messageDeleted.Register(value);
 		remove => this._messageDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageDeleteEventArgs> _messageDeleted;
 
 	/// <summary>
@@ -614,11 +666,12 @@ public event AsyncEventHandler<DiscordClient, MessageBulkDeleteEventArgs> Messag
 		add => this._messageBulkDeleted.Register(value);
 		remove => this._messageBulkDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageBulkDeleteEventArgs> _messageBulkDeleted;
 
-	#endregion
+#endregion
 
-	#region Message Reaction
+#region Message Reaction
 
 	/// <summary>
 	/// Fired when a reaction gets added to a message.
@@ -629,6 +682,7 @@ public event AsyncEventHandler<DiscordClient, MessageReactionAddEventArgs> Messa
 		add => this._messageReactionAdded.Register(value);
 		remove => this._messageReactionAdded.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageReactionAddEventArgs> _messageReactionAdded;
 
 	/// <summary>
@@ -640,6 +694,7 @@ public event AsyncEventHandler<DiscordClient, MessageReactionRemoveEventArgs> Me
 		add => this._messageReactionRemoved.Register(value);
 		remove => this._messageReactionRemoved.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageReactionRemoveEventArgs> _messageReactionRemoved;
 
 	/// <summary>
@@ -651,6 +706,7 @@ public event AsyncEventHandler<DiscordClient, MessageReactionsClearEventArgs> Me
 		add => this._messageReactionsCleared.Register(value);
 		remove => this._messageReactionsCleared.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageReactionsClearEventArgs> _messageReactionsCleared;
 
 	/// <summary>
@@ -662,11 +718,12 @@ public event AsyncEventHandler<DiscordClient, MessageReactionRemoveEmojiEventArg
 		add => this._messageReactionRemovedEmoji.Register(value);
 		remove => this._messageReactionRemovedEmoji.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, MessageReactionRemoveEmojiEventArgs> _messageReactionRemovedEmoji;
 
-	#endregion
+#endregion
 
-	#region Stage Instance
+#region Stage Instance
 
 	/// <summary>
 	/// Fired when a Stage Instance is created.
@@ -677,6 +734,7 @@ public event AsyncEventHandler<DiscordClient, StageInstanceCreateEventArgs> Stag
 		add => this._stageInstanceCreated.Register(value);
 		remove => this._stageInstanceCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, StageInstanceCreateEventArgs> _stageInstanceCreated;
 
 	/// <summary>
@@ -688,6 +746,7 @@ public event AsyncEventHandler<DiscordClient, StageInstanceUpdateEventArgs> Stag
 		add => this._stageInstanceUpdated.Register(value);
 		remove => this._stageInstanceUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, StageInstanceUpdateEventArgs> _stageInstanceUpdated;
 
 	/// <summary>
@@ -699,11 +758,12 @@ public event AsyncEventHandler<DiscordClient, StageInstanceDeleteEventArgs> Stag
 		add => this._stageInstanceDeleted.Register(value);
 		remove => this._stageInstanceDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, StageInstanceDeleteEventArgs> _stageInstanceDeleted;
 
-	#endregion
+#endregion
 
-	#region Thread
+#region Thread
 
 	/// <summary>
 	/// Fired when a thread is created.
@@ -714,6 +774,7 @@ public event AsyncEventHandler<DiscordClient, ThreadCreateEventArgs> ThreadCreat
 		add => this._threadCreated.Register(value);
 		remove => this._threadCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadCreateEventArgs> _threadCreated;
 
 	/// <summary>
@@ -725,6 +786,7 @@ public event AsyncEventHandler<DiscordClient, ThreadUpdateEventArgs> ThreadUpdat
 		add => this._threadUpdated.Register(value);
 		remove => this._threadUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadUpdateEventArgs> _threadUpdated;
 
 	/// <summary>
@@ -736,6 +798,7 @@ public event AsyncEventHandler<DiscordClient, ThreadDeleteEventArgs> ThreadDelet
 		add => this._threadDeleted.Register(value);
 		remove => this._threadDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadDeleteEventArgs> _threadDeleted;
 
 	/// <summary>
@@ -747,6 +810,7 @@ public event AsyncEventHandler<DiscordClient, ThreadListSyncEventArgs> ThreadLis
 		add => this._threadListSynced.Register(value);
 		remove => this._threadListSynced.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadListSyncEventArgs> _threadListSynced;
 
 	/// <summary>
@@ -758,6 +822,7 @@ public event AsyncEventHandler<DiscordClient, ThreadMemberUpdateEventArgs> Threa
 		add => this._threadMemberUpdated.Register(value);
 		remove => this._threadMemberUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadMemberUpdateEventArgs> _threadMemberUpdated;
 
 	/// <summary>
@@ -769,11 +834,12 @@ public event AsyncEventHandler<DiscordClient, ThreadMembersUpdateEventArgs> Thre
 		add => this._threadMembersUpdated.Register(value);
 		remove => this._threadMembersUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ThreadMembersUpdateEventArgs> _threadMembersUpdated;
 
-	#endregion
+#endregion
 
-	#region Activities
+#region Activities
 
 	/// <summary>
 	/// Fired when a embedded activity has been updated.
@@ -783,11 +849,12 @@ public event AsyncEventHandler<DiscordClient, EmbeddedActivityUpdateEventArgs> E
 		add => this._embeddedActivityUpdated.Register(value);
 		remove => this._embeddedActivityUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, EmbeddedActivityUpdateEventArgs> _embeddedActivityUpdated;
 
-	#endregion
+#endregion
 
-	#region User/Presence Update
+#region User/Presence Update
 
 	/// <summary>
 	/// Fired when a presence has been updated.
@@ -798,8 +865,8 @@ public event AsyncEventHandler<DiscordClient, PresenceUpdateEventArgs> PresenceU
 		add => this._presenceUpdated.Register(value);
 		remove => this._presenceUpdated.Unregister(value);
 	}
-	private AsyncEvent<DiscordClient, PresenceUpdateEventArgs> _presenceUpdated;
 
+	private AsyncEvent<DiscordClient, PresenceUpdateEventArgs> _presenceUpdated;
 
 	/// <summary>
 	/// Fired when the current user updates their settings.
@@ -810,6 +877,7 @@ public event AsyncEventHandler<DiscordClient, UserSettingsUpdateEventArgs> UserS
 		add => this._userSettingsUpdated.Register(value);
 		remove => this._userSettingsUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, UserSettingsUpdateEventArgs> _userSettingsUpdated;
 
 	/// <summary>
@@ -824,11 +892,12 @@ public event AsyncEventHandler<DiscordClient, UserUpdateEventArgs> UserUpdated
 		add => this._userUpdated.Register(value);
 		remove => this._userUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, UserUpdateEventArgs> _userUpdated;
 
-	#endregion
+#endregion
 
-	#region Voice
+#region Voice
 
 	/// <summary>
 	/// Fired when someone joins/leaves/moves voice channels.
@@ -839,6 +908,7 @@ public event AsyncEventHandler<DiscordClient, VoiceStateUpdateEventArgs> VoiceSt
 		add => this._voiceStateUpdated.Register(value);
 		remove => this._voiceStateUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, VoiceStateUpdateEventArgs> _voiceStateUpdated;
 
 	/// <summary>
@@ -850,11 +920,12 @@ public event AsyncEventHandler<DiscordClient, VoiceServerUpdateEventArgs> VoiceS
 		add => this._voiceServerUpdated.Register(value);
 		remove => this._voiceServerUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, VoiceServerUpdateEventArgs> _voiceServerUpdated;
 
-	#endregion
+#endregion
 
-	#region Application
+#region Application
 
 	/// <summary>
 	/// Fired when a new application command is registered.
@@ -864,6 +935,7 @@ public event AsyncEventHandler<DiscordClient, ApplicationCommandEventArgs> Appli
 		add => this._applicationCommandCreated.Register(value);
 		remove => this._applicationCommandCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ApplicationCommandEventArgs> _applicationCommandCreated;
 
 	/// <summary>
@@ -874,6 +946,7 @@ public event AsyncEventHandler<DiscordClient, ApplicationCommandEventArgs> Appli
 		add => this._applicationCommandUpdated.Register(value);
 		remove => this._applicationCommandUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ApplicationCommandEventArgs> _applicationCommandUpdated;
 
 	/// <summary>
@@ -884,6 +957,7 @@ public event AsyncEventHandler<DiscordClient, ApplicationCommandEventArgs> Appli
 		add => this._applicationCommandDeleted.Register(value);
 		remove => this._applicationCommandDeleted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ApplicationCommandEventArgs> _applicationCommandDeleted;
 
 	/// <summary>
@@ -894,6 +968,7 @@ public event AsyncEventHandler<DiscordClient, GuildApplicationCommandCountEventA
 		add => this._guildApplicationCommandCountUpdated.Register(value);
 		remove => this._guildApplicationCommandCountUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, GuildApplicationCommandCountEventArgs> _guildApplicationCommandCountUpdated;
 
 	/// <summary>
@@ -918,10 +993,9 @@ public event AsyncEventHandler<DiscordClient, ApplicationCommandPermissionsUpdat
 
 	private AsyncEvent<DiscordClient, ApplicationCommandPermissionsUpdateEventArgs> _applicationCommandPermissionsUpdated;
 
+#endregion
 
-	#endregion
-
-	#region Misc
+#region Misc
 
 	/// <summary>
 	/// Fired when an interaction is invoked.
@@ -931,6 +1005,7 @@ public event AsyncEventHandler<DiscordClient, InteractionCreateEventArgs> Intera
 		add => this._interactionCreated.Register(value);
 		remove => this._interactionCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, InteractionCreateEventArgs> _interactionCreated;
 
 	/// <summary>
@@ -941,6 +1016,7 @@ public event AsyncEventHandler<DiscordClient, ComponentInteractionCreateEventArg
 		add => this._componentInteractionCreated.Register(value);
 		remove => this._componentInteractionCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ComponentInteractionCreateEventArgs> _componentInteractionCreated;
 
 	/// <summary>
@@ -951,6 +1027,7 @@ public event AsyncEventHandler<DiscordClient, EntitlementCreateEventArgs> Entitl
 		add => this._entitlementCreated.Register(value);
 		remove => this._entitlementCreated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, EntitlementCreateEventArgs> _entitlementCreated;
 
 	/// <summary>
@@ -961,6 +1038,7 @@ public event AsyncEventHandler<DiscordClient, EntitlementUpdateEventArgs> Entitl
 		add => this._entitlementUpdated.Register(value);
 		remove => this._entitlementUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, EntitlementUpdateEventArgs> _entitlementUpdated;
 
 	/// <summary>
@@ -974,7 +1052,6 @@ public event AsyncEventHandler<DiscordClient, EntitlementDeleteEventArgs> Entitl
 
 	private AsyncEvent<DiscordClient, EntitlementDeleteEventArgs> _entitlementDeleted;
 
-
 	/// <summary>
 	/// Fired when a user starts typing in a channel.
 	/// </summary>
@@ -983,6 +1060,7 @@ public event AsyncEventHandler<DiscordClient, TypingStartEventArgs> TypingStarte
 		add => this._typingStarted.Register(value);
 		remove => this._typingStarted.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, TypingStartEventArgs> _typingStarted;
 
 	/// <summary>
@@ -993,6 +1071,7 @@ public event AsyncEventHandler<DiscordClient, UnknownEventArgs> UnknownEvent
 		add => this._unknownEvent.Register(value);
 		remove => this._unknownEvent.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, UnknownEventArgs> _unknownEvent;
 
 	/// <summary>
@@ -1003,6 +1082,7 @@ public event AsyncEventHandler<DiscordClient, WebhooksUpdateEventArgs> WebhooksU
 		add => this._webhooksUpdated.Register(value);
 		remove => this._webhooksUpdated.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, WebhooksUpdateEventArgs> _webhooksUpdated;
 
 	/// <summary>
@@ -1013,11 +1093,12 @@ public event AsyncEventHandler<DiscordClient, ClientErrorEventArgs> ClientErrore
 		add => this._clientErrored.Register(value);
 		remove => this._clientErrored.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ClientErrorEventArgs> _clientErrored;
 
-	#endregion
+#endregion
 
-	#region Error Handling
+#region Error Handling
 
 	/// <summary>
 	/// Handles event errors.
@@ -1037,10 +1118,12 @@ internal void EventErrorHandler<TArgs>(AsyncEvent<DiscordClient, TArgs> asyncEve
 		}
 
 		this.Logger.LogError(LoggerEvents.EventHandlerException, ex, "Event handler exception for event {0} thrown from {1} (defined in {2})", asyncEvent.Name, handler.Method, handler.Method.DeclaringType);
-		this._clientErrored.InvokeAsync(sender, new(this.ShardClients[0].ServiceProvider) { EventName = asyncEvent.Name, Exception = ex }).ConfigureAwait(false).GetAwaiter().GetResult();
+		this._clientErrored.InvokeAsync(sender, new(this.ShardClients[0].ServiceProvider)
+		{
+			EventName = asyncEvent.Name, Exception = ex
+		}).ConfigureAwait(false).GetAwaiter().GetResult();
 	}
 
-
 	/// <summary>
 	/// Fired on heartbeat attempt cancellation due to too many failed heartbeats.
 	/// </summary>
@@ -1049,6 +1132,7 @@ public event AsyncEventHandler<DiscordClient, ZombiedEventArgs> Zombied
 		add => this._zombied.Register(value);
 		remove => this._zombied.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, ZombiedEventArgs> _zombied;
 
 	/// <summary>
@@ -1059,6 +1143,7 @@ public event AsyncEventHandler<DiscordClient, PayloadReceivedEventArgs> PayloadR
 		add => this._payloadReceived.Register(value);
 		remove => this._payloadReceived.Unregister(value);
 	}
+
 	private AsyncEvent<DiscordClient, PayloadReceivedEventArgs> _payloadReceived;
 
 	/// <summary>
@@ -1072,9 +1157,9 @@ public event AsyncEventHandler<DiscordClient, PayloadReceivedEventArgs> PayloadR
 	private void Goof<TArgs>(AsyncEvent<DiscordClient, TArgs> asyncEvent, Exception ex, AsyncEventHandler<DiscordClient, TArgs> handler, DiscordClient sender, TArgs eventArgs)
 		where TArgs : AsyncEventArgs => this.Logger.LogCritical(LoggerEvents.EventHandlerException, ex, "Exception event handler {0} (defined in {1}) threw an exception", handler.Method, handler.Method.DeclaringType);
 
-	#endregion
+#endregion
 
-	#region Event Dispatchers
+#region Event Dispatchers
 
 	/// <summary>
 	/// Handles the client zombied event.
@@ -1580,7 +1665,6 @@ private Task Client_ApplicationCommandUpdated(DiscordClient client, ApplicationC
 	private Task Client_ApplicationCommandDeleted(DiscordClient client, ApplicationCommandEventArgs e)
 		=> this._applicationCommandDeleted.InvokeAsync(client, e);
 
-
 	/// <summary>
 	/// Handles the guild application command count updated event.
 	/// </summary>
@@ -1589,7 +1673,6 @@ private Task Client_ApplicationCommandDeleted(DiscordClient client, ApplicationC
 	private Task Client_GuildApplicationCommandCountUpdated(DiscordClient client, GuildApplicationCommandCountEventArgs e)
 		=> this._guildApplicationCommandCountUpdated.InvokeAsync(client, e);
 
-
 	/// <summary>
 	/// Handles the application command permissions updated event.
 	/// </summary>
@@ -1694,7 +1777,6 @@ private Task Client_ThreadMemberUpdated(DiscordClient client, ThreadMemberUpdate
 	private Task Client_ThreadMembersUpdated(DiscordClient client, ThreadMembersUpdateEventArgs e)
 		=> this._threadMembersUpdated.InvokeAsync(client, e);
 
-
 	/// <summary>
 	/// Handles the scheduled event created event.
 	/// </summary>
@@ -1783,5 +1865,5 @@ private Task Client_GuildAuditLogEntryCreated(DiscordClient client, GuildAuditLo
 	private Task Client_VoiceChannelStatusUpdated(DiscordClient client, VoiceChannelStatusUpdateEventArgs e)
 		=> this._voiceChannelStatusUpdated.InvokeAsync(client, e);
 
-	#endregion
+#endregion
 }
diff --git a/DisCatSharp/Clients/DiscordWebhookClient.cs b/DisCatSharp/Clients/DiscordWebhookClient.cs
index b54ad246a5..c84f8b0bc8 100644
--- a/DisCatSharp/Clients/DiscordWebhookClient.cs
+++ b/DisCatSharp/Clients/DiscordWebhookClient.cs
@@ -68,8 +68,14 @@ public DiscordWebhookClient()
 	/// <param name="loggerFactory">The optional logging factory to use for this client. Defaults to null.</param>
 	/// <param name="minimumLogLevel">The minimum logging level for messages. Defaults to information.</param>
 	/// <param name="logTimestampFormat">The timestamp format to use for the logger.</param>
-	public DiscordWebhookClient(IWebProxy proxy = null!, TimeSpan? timeout = null, bool useRelativeRateLimit = true,
-		ILoggerFactory loggerFactory = null!, LogLevel minimumLogLevel = LogLevel.Information, string logTimestampFormat = "yyyy-MM-dd HH:mm:ss zzz")
+	public DiscordWebhookClient(
+		IWebProxy proxy = null!,
+		TimeSpan? timeout = null,
+		bool useRelativeRateLimit = true,
+		ILoggerFactory loggerFactory = null!,
+		LogLevel minimumLogLevel = LogLevel.Information,
+		string logTimestampFormat = "yyyy-MM-dd HH:mm:ss zzz"
+	)
 	{
 		this.MinimumLogLevel = minimumLogLevel;
 		this.LogTimestampFormat = logTimestampFormat;
@@ -99,6 +105,7 @@ public async Task<DiscordWebhook> AddWebhookAsync(ulong id, string token)
 	{
 		if (string.IsNullOrWhiteSpace(token))
 			throw new ArgumentNullException(nameof(token));
+
 		token = token.Trim();
 
 		if (this.Hooks.Any(x => x.Id == id))
@@ -207,7 +214,6 @@ public async Task<Dictionary<DiscordWebhook, DiscordMessage>> BroadcastMessageAs
 		var messages = new Dictionary<DiscordWebhook, DiscordMessage>();
 
 		foreach (var hook in this.Hooks)
-		{
 			try
 			{
 				if (this.Username != null)
@@ -220,7 +226,6 @@ public async Task<Dictionary<DiscordWebhook, DiscordMessage>> BroadcastMessageAs
 			{
 				deadHooks.Add(hook);
 			}
-		}
 
 		// Removing dead webhooks from collection
 		foreach (var xwh in deadHooks)
diff --git a/DisCatSharp/DiscordConfiguration.cs b/DisCatSharp/DiscordConfiguration.cs
index ae2a7a7a58..549a438e93 100644
--- a/DisCatSharp/DiscordConfiguration.cs
+++ b/DisCatSharp/DiscordConfiguration.cs
@@ -34,6 +34,7 @@ public string Token
 			this._token = value.Trim();
 		}
 	}
+
 	private string _token = "";
 
 	/// <summary>
@@ -314,9 +315,10 @@ internal List<Type> TrackExceptions
 				throw new AccessViolationException("Cannot set this as non-library-dev");
 			else if (value == null)
 				this._exceptions.Clear();
-			else this._exceptions = value.All(val => val.BaseType == typeof(DisCatSharpException))
-				? value
-				: throw new InvalidOperationException("Can only track exceptions who inherit from " + nameof(DisCatSharpException) + " and must be constructed with typeof(Type)");
+			else
+				this._exceptions = value.All(val => val.BaseType == typeof(DisCatSharpException))
+					? value
+					: throw new InvalidOperationException("Can only track exceptions who inherit from " + nameof(DisCatSharpException) + " and must be constructed with typeof(Type)");
 		}
 	}
 
@@ -325,8 +327,7 @@ internal List<Type> TrackExceptions
 	/// </summary>
 	private List<Type> _exceptions = new()
 	{
-		typeof(ServerErrorException),
-		typeof(BadRequestException)
+		typeof(ServerErrorException), typeof(BadRequestException)
 	};
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Application/DiscordApplication.cs b/DisCatSharp/Entities/Application/DiscordApplication.cs
index 3440e8fdba..6f5f8e55d7 100644
--- a/DisCatSharp/Entities/Application/DiscordApplication.cs
+++ b/DisCatSharp/Entities/Application/DiscordApplication.cs
@@ -210,7 +210,7 @@ public string GetAvatarUrl(ImageFormat fmt, ushort size = 1024)
 			ImageFormat.Jpeg => "jpg",
 			ImageFormat.Auto or ImageFormat.Png => "png",
 			ImageFormat.WebP => "webp",
-			_ => throw new ArgumentOutOfRangeException(nameof(fmt)),
+			_ => throw new ArgumentOutOfRangeException(nameof(fmt))
 		};
 		var ssize = size.ToString(CultureInfo.InvariantCulture);
 		return !string.IsNullOrWhiteSpace(this.CoverImageHash)
@@ -279,7 +279,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
@@ -390,7 +390,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Application/DiscordApplicationCommand.cs b/DisCatSharp/Entities/Application/DiscordApplicationCommand.cs
index 5faf41dc34..640864edf7 100644
--- a/DisCatSharp/Entities/Application/DiscordApplicationCommand.cs
+++ b/DisCatSharp/Entities/Application/DiscordApplicationCommand.cs
@@ -127,13 +127,22 @@ public DiscordApplicationCommandLocalization DescriptionLocalizations
 	/// <param name="allowedContexts">Where the command can be used.</param>
 	/// <param name="integrationTypes">The allowed integration types.</param>
 	public DiscordApplicationCommand(
-		string name, string description,
+		string name,
+		string description,
 		IEnumerable<DiscordApplicationCommandOption>? options = null,
 		ApplicationCommandType type = ApplicationCommandType.ChatInput,
-		DiscordApplicationCommandLocalization? nameLocalizations = null, DiscordApplicationCommandLocalization? descriptionLocalizations = null,
-		Permissions? defaultMemberPermissions = null, bool? dmPermission = null, bool isNsfw = false,
-		List<ApplicationCommandContexts>? allowedContexts = null, List<ApplicationCommandIntegrationTypes>? integrationTypes = null)
-		: base(new() { "guild_id" })
+		DiscordApplicationCommandLocalization? nameLocalizations = null,
+		DiscordApplicationCommandLocalization? descriptionLocalizations = null,
+		Permissions? defaultMemberPermissions = null,
+		bool? dmPermission = null,
+		bool isNsfw = false,
+		List<ApplicationCommandContexts>? allowedContexts = null,
+		List<ApplicationCommandIntegrationTypes>? integrationTypes = null
+	)
+		: base(new()
+		{
+			"guild_id"
+		})
 	{
 		if (type is ApplicationCommandType.ChatInput)
 		{
@@ -155,6 +164,7 @@ public DiscordApplicationCommand(
 				throw new ArgumentException("Context menus do not support descriptions.");
 			if (options?.Any() ?? false)
 				throw new ArgumentException("Context menus do not support options.");
+
 			description = string.Empty;
 
 			this.RawNameLocalizations = nameLocalizations?.GetKeyValuePairs();
@@ -177,7 +187,10 @@ public DiscordApplicationCommand(
 	/// Creates a new empty Discord Application Command.
 	/// </summary>
 	internal DiscordApplicationCommand()
-		: base(new() { "name_localizations", "description_localizations" }) // Why tf is that so inconsistent?!
+		: base(new()
+		{
+			"name_localizations", "description_localizations"
+		}) // Why tf is that so inconsistent?!
 	{ }
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Application/DiscordApplicationCommandLocalization.cs b/DisCatSharp/Entities/Application/DiscordApplicationCommandLocalization.cs
index 6c43b1fa77..ae70f73a5e 100644
--- a/DisCatSharp/Entities/Application/DiscordApplicationCommandLocalization.cs
+++ b/DisCatSharp/Entities/Application/DiscordApplicationCommandLocalization.cs
@@ -16,7 +16,39 @@ public sealed class DiscordApplicationCommandLocalization
 	/// <summary>
 	/// Gets valid [locales](xref:modules_application_commands_translations_reference#valid-locales) for Discord.
 	/// </summary>
-	internal List<string> ValidLocales = new() { "ru", "fi", "hr", "de", "hu", "sv-SE", "cs", "fr", "it", "en-GB", "pt-BR", "ja", "tr", "en-US", "es-ES", "uk", "hi", "th", "el", "no", "ro", "ko", "zh-TW", "vi", "zh-CN", "pl", "bg", "da", "nl", "lt" };
+	internal List<string> ValidLocales = new()
+	{
+		"ru",
+		"fi",
+		"hr",
+		"de",
+		"hu",
+		"sv-SE",
+		"cs",
+		"fr",
+		"it",
+		"en-GB",
+		"pt-BR",
+		"ja",
+		"tr",
+		"en-US",
+		"es-ES",
+		"uk",
+		"hi",
+		"th",
+		"el",
+		"no",
+		"ro",
+		"ko",
+		"zh-TW",
+		"vi",
+		"zh-CN",
+		"pl",
+		"bg",
+		"da",
+		"nl",
+		"lt"
+	};
 
 	/// <summary>
 	/// Adds a localization.
@@ -26,14 +58,10 @@ public sealed class DiscordApplicationCommandLocalization
 	public void AddLocalization(string locale, string value)
 	{
 		if (this.Validate(locale))
-		{
 			this.Localizations.Add(locale, value);
-		}
 		else
-		{
 			throw new NotSupportedException($"The provided locale \"{locale}\" is not valid for Discord.\n" +
 			                                $"Valid locales: {string.Join(", ", this.ValidLocales)}");
-		}
 	}
 
 	/// <summary>
@@ -55,14 +83,10 @@ public DiscordApplicationCommandLocalization() { }
 	public DiscordApplicationCommandLocalization(Dictionary<string, string> localizations)
 	{
 		if (localizations != null)
-		{
 			foreach (var locale in localizations.Keys)
-			{
 				if (!this.Validate(locale))
 					throw new NotSupportedException($"The provided locale \"{locale}\" is not valid for Discord.\n" +
 					                                $"Valid locales: {string.Join(", ", this.ValidLocales)}");
-			}
-		}
 
 		this.Localizations = localizations;
 	}
diff --git a/DisCatSharp/Entities/Application/DiscordApplicationCommandOption.cs b/DisCatSharp/Entities/Application/DiscordApplicationCommandOption.cs
index bad9e105da..e4b4a13956 100644
--- a/DisCatSharp/Entities/Application/DiscordApplicationCommandOption.cs
+++ b/DisCatSharp/Entities/Application/DiscordApplicationCommandOption.cs
@@ -129,7 +129,22 @@ public DiscordApplicationCommandLocalization DescriptionLocalizations
 	/// <param name="descriptionLocalizations">The localizations of the parameter description.</param>
 	/// <param name="minimumLength">The minimum allowed length of the string. (Min 0)</param>
 	/// <param name="maximumLength">The maximum allowed length of the string. (Min 1)</param>
-	public DiscordApplicationCommandOption(string name, string description, ApplicationCommandOptionType type, bool required = false, IEnumerable<DiscordApplicationCommandOptionChoice>? choices = null, IEnumerable<DiscordApplicationCommandOption>? options = null, IEnumerable<ChannelType>? channelTypes = null, bool autocomplete = false, object minimumValue = null, object maximumValue = null, DiscordApplicationCommandLocalization nameLocalizations = null, DiscordApplicationCommandLocalization descriptionLocalizations = null, int? minimumLength = null, int? maximumLength = null)
+	public DiscordApplicationCommandOption(
+		string name,
+		string description,
+		ApplicationCommandOptionType type,
+		bool required = false,
+		IEnumerable<DiscordApplicationCommandOptionChoice>? choices = null,
+		IEnumerable<DiscordApplicationCommandOption>? options = null,
+		IEnumerable<ChannelType>? channelTypes = null,
+		bool autocomplete = false,
+		object minimumValue = null,
+		object maximumValue = null,
+		DiscordApplicationCommandLocalization nameLocalizations = null,
+		DiscordApplicationCommandLocalization descriptionLocalizations = null,
+		int? minimumLength = null,
+		int? maximumLength = null
+	)
 	{
 		if (!Utilities.IsValidSlashCommandName(name))
 			throw new ArgumentException("Invalid application command option name specified. It must be below 32 characters and not contain any whitespace.", nameof(name));
@@ -139,6 +154,7 @@ public DiscordApplicationCommandOption(string name, string description, Applicat
 			throw new ArgumentException("Application command option description cannot exceed 100 characters.", nameof(description));
 		if (autocomplete && (choices?.Any() ?? false))
 			throw new InvalidOperationException("Auto-complete slash command options cannot provide choices.");
+
 		if (type == ApplicationCommandOptionType.SubCommand || type == ApplicationCommandOptionType.SubCommandGroup)
 			if (string.IsNullOrWhiteSpace(description))
 				throw new ArgumentException("Slash commands need a description.", nameof(description));
diff --git a/DisCatSharp/Entities/Application/DiscordApplicationRoleConnectionMetadata.cs b/DisCatSharp/Entities/Application/DiscordApplicationRoleConnectionMetadata.cs
index 845d9d5505..4a7f71b07f 100644
--- a/DisCatSharp/Entities/Application/DiscordApplicationRoleConnectionMetadata.cs
+++ b/DisCatSharp/Entities/Application/DiscordApplicationRoleConnectionMetadata.cs
@@ -67,8 +67,12 @@ public DiscordApplicationCommandLocalization DescriptionLocalizations
 	/// Creates a new instance of a <see cref="DiscordApplicationRoleConnectionMetadata"/>.
 	/// </summary>
 	public DiscordApplicationRoleConnectionMetadata(
-		ApplicationRoleConnectionMetadataType type, string key, string name, string description,
-		DiscordApplicationCommandLocalization nameLocalizations = null, DiscordApplicationCommandLocalization descriptionLocalizations = null
+		ApplicationRoleConnectionMetadataType type,
+		string key,
+		string name,
+		string description,
+		DiscordApplicationCommandLocalization nameLocalizations = null,
+		DiscordApplicationCommandLocalization descriptionLocalizations = null
 	)
 	{
 		this.Type = type;
diff --git a/DisCatSharp/Entities/Application/DiscordRpcApplication.cs b/DisCatSharp/Entities/Application/DiscordRpcApplication.cs
index 10e607f47e..be2304a744 100644
--- a/DisCatSharp/Entities/Application/DiscordRpcApplication.cs
+++ b/DisCatSharp/Entities/Application/DiscordRpcApplication.cs
@@ -25,8 +25,10 @@ public sealed class DiscordRpcApplication : SnowflakeObject, IEquatable<DiscordR
 
 	[JsonProperty("description")]
 	public string? Description;
+
 	[JsonProperty("summary")]
 	public string? Summary;
+
 	[JsonProperty("type")]
 	public string Type;
 
@@ -44,8 +46,10 @@ public sealed class DiscordRpcApplication : SnowflakeObject, IEquatable<DiscordR
 
 	[JsonProperty("terms_of_service_url")]
 	public string? TermsOfServiceUrl;
+
 	[JsonProperty("privacy_policy_url")]
 	public string? PrivacyPolicyUrl;
+
 	[JsonProperty("install_params")]
 	public DiscordApplicationInstallParams InstallParams;
 
@@ -114,7 +118,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Channel/DiscordChannel.cs b/DisCatSharp/Entities/Channel/DiscordChannel.cs
index 830b3304ee..0fadf5a729 100644
--- a/DisCatSharp/Entities/Channel/DiscordChannel.cs
+++ b/DisCatSharp/Entities/Channel/DiscordChannel.cs
@@ -90,6 +90,7 @@ public DiscordChannel Parent
 	/// </summary>
 	[JsonProperty("theme_color", NullValueHandling = NullValueHandling.Ignore)]
 	internal int? ThemeColorInt { get; set; }
+
 	[JsonIgnore]
 	public DiscordColor? ThemeColor
 		=> this.ThemeColorInt.HasValue ? new DiscordColor(this.ThemeColorInt.Value) : null;
@@ -164,6 +165,7 @@ public IReadOnlyList<DiscordOverwrite> PermissionOverwrites
 
 	[JsonProperty("permission_overwrites", NullValueHandling = NullValueHandling.Ignore)]
 	internal List<DiscordOverwrite> PermissionOverwritesInternal = new();
+
 	[JsonIgnore]
 	private readonly Lazy<IReadOnlyList<DiscordOverwrite>> _permissionOverwritesLazy;
 
@@ -211,14 +213,12 @@ public IReadOnlyList<DiscordOverwrite> PermissionOverwrites
 	[JsonProperty("video_quality_mode", NullValueHandling = NullValueHandling.Ignore)]
 	public VideoQualityMode? QualityMode { get; internal set; }
 
-
 	/// <summary>
 	/// List of available tags for forum posts.
 	/// </summary>
 	[JsonIgnore]
 	public IReadOnlyList<ForumPostTag> AvailableTags => this.InternalAvailableTags;
 
-
 	/// <summary>
 	/// List of available tags for forum posts.
 	/// </summary>
@@ -239,8 +239,7 @@ public IReadOnlyList<DiscordOverwrite> PermissionOverwrites
 	/// </summary>
 	[JsonIgnore]
 	public DateTimeOffset? LastPinTimestamp
-		=> !string.IsNullOrWhiteSpace(this.LastPinTimestampRaw) && DateTimeOffset.TryParse(this.LastPinTimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
-			dto : null;
+		=> !string.IsNullOrWhiteSpace(this.LastPinTimestampRaw) && DateTimeOffset.TryParse(this.LastPinTimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ? dto : null;
 
 	/// <summary>
 	/// Gets when the last pinned message was pinned as raw string.
@@ -300,7 +299,6 @@ public string Mention
 	public DiscordVoiceRegion RtcRegion
 		=> this.RtcRegionId != null ? this.Discord.VoiceRegions[this.RtcRegionId] : null;
 
-
 	/// <summary>
 	/// Only sent on the resolved channels of interaction responses for application commands.
 	/// Gets the permissions of the user in this channel who invoked the command.
@@ -312,7 +310,17 @@ public DiscordVoiceRegion RtcRegion
 	/// Initializes a new instance of the <see cref="DiscordChannel"/> class.
 	/// </summary>
 	internal DiscordChannel()
-		: base(new() { "hashes", "guild_hashes", "owner_id", "thread_metadata", "message_count", "member_count", "total_message_sent", "member" })
+		: base(new()
+		{
+			"hashes",
+			"guild_hashes",
+			"owner_id",
+			"thread_metadata",
+			"message_count",
+			"member_count",
+			"total_message_sent",
+			"member"
+		})
 	{
 		this._permissionOverwritesLazy = new(() => new ReadOnlyCollection<DiscordOverwrite>(this.PermissionOverwritesInternal));
 	}
@@ -326,7 +334,7 @@ internal DiscordChannel(List<string>? ignored = null)
 		this._permissionOverwritesLazy = new(() => new ReadOnlyCollection<DiscordOverwrite>(this.PermissionOverwritesInternal));
 	}
 
-	#region Methods
+#region Methods
 
 	/// <summary>
 	/// Sends a message to this channel.
@@ -340,7 +348,7 @@ internal DiscordChannel(List<string>? ignored = null)
 	public Task<DiscordMessage> SendMessageAsync(string content) =>
 		!this.IsWritable()
 			? throw new ArgumentException("Cannot send a text message to a non-text channel.")
-			: this.Discord.ApiClient.CreateMessageAsync(this.Id, content, null, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
+			: this.Discord.ApiClient.CreateMessageAsync(this.Id, content, null, null, null, false, false);
 
 	/// <summary>
 	/// Sends a message to this channel.
@@ -354,7 +362,12 @@ public Task<DiscordMessage> SendMessageAsync(string content) =>
 	public Task<DiscordMessage> SendMessageAsync(DiscordEmbed embed) =>
 		!this.IsWritable()
 			? throw new ArgumentException("Cannot send a text message to a non-text channel.")
-			: this.Discord.ApiClient.CreateMessageAsync(this.Id, null, embed != null ? new[] { embed } : null, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
+			: this.Discord.ApiClient.CreateMessageAsync(this.Id, null, embed != null
+				? new[]
+				{
+					embed
+				}
+				: null, null, null, false, false);
 
 	/// <summary>
 	/// Sends a message to this channel.
@@ -369,7 +382,12 @@ public Task<DiscordMessage> SendMessageAsync(DiscordEmbed embed) =>
 	public Task<DiscordMessage> SendMessageAsync(string content, DiscordEmbed embed) =>
 		!this.IsWritable()
 			? throw new ArgumentException("Cannot send a text message to a non-text channel.")
-			: this.Discord.ApiClient.CreateMessageAsync(this.Id, content, embed != null ? new[] { embed } : null, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
+			: this.Discord.ApiClient.CreateMessageAsync(this.Id, content, embed != null
+				? new[]
+				{
+					embed
+				}
+				: null, null, null, false, false);
 
 	/// <summary>
 	/// Sends a message to this channel.
@@ -397,7 +415,6 @@ public Task<DiscordMessage> SendMessageAsync(Action<DiscordMessageBuilder> actio
 		var builder = new DiscordMessageBuilder();
 		action(builder);
 
-
 		return !this.IsWritable()
 			? throw new ArgumentException("Cannot send a text message to a non-text channel.")
 			: this.Discord.ApiClient.CreateMessageAsync(this.Id, builder);
@@ -443,13 +460,9 @@ public async Task<DiscordChannel> CloneAsync(string reason = null)
 		}
 
 		if (this.Type == ChannelType.Stage)
-		{
 			userLimit = null;
-		}
 		if (!this.IsWritable())
-		{
 			perUserRateLimit = Optional.None;
-		}
 
 		return await this.Guild.CreateChannelAsync(this.Name, this.Type, this.Parent, this.Topic, bitrate, userLimit, ovrs, this.IsNsfw, perUserRateLimit, this.QualityMode, this.DefaultAutoArchiveDuration, this.Flags, reason).ConfigureAwait(false);
 	}
@@ -542,8 +555,8 @@ public Task ModifyForumAsync(Action<ForumChannelEditModel> action)
 		return mdl.AvailableTags.HasValue && mdl.AvailableTags.Value.Count > 20
 			? throw new NotSupportedException("Cannot have more than 20 tags in a forum channel.")
 			: (Task)this.Discord.ApiClient.ModifyForumChannelAsync(this.Id, mdl.Name, mdl.Position, mdl.Topic, mdl.Template, mdl.Nsfw,
-			mdl.Parent.Map(p => p?.Id), mdl.AvailableTags, mdl.DefaultReactionEmoji, mdl.PerUserRateLimit, mdl.PostCreateUserRateLimit,
-			mdl.DefaultSortOrder, mdl.DefaultAutoArchiveDuration, mdl.PermissionOverwrites, mdl.Flags, mdl.AuditLogReason);
+				mdl.Parent.Map(p => p?.Id), mdl.AvailableTags, mdl.DefaultReactionEmoji, mdl.PerUserRateLimit, mdl.PostCreateUserRateLimit,
+				mdl.DefaultSortOrder, mdl.DefaultAutoArchiveDuration, mdl.PermissionOverwrites, mdl.Flags, mdl.AuditLogReason);
 	}
 
 	/// <summary>
@@ -572,7 +585,11 @@ public Task ModifyPositionAsync(int position, string reason = null)
 			.Select(x => new RestGuildChannelReorderPayload
 			{
 				ChannelId = x.Id,
-				Position = x.Id == this.Id ? position : x.Position >= position ? x.Position + 1 : x.Position
+				Position = x.Id == this.Id
+					? position
+					: x.Position >= position
+						? x.Position + 1
+						: x.Position
 			});
 
 		return this.Discord.ApiClient.ModifyGuildChannelPositionAsync(this.Guild.Id, pmds, reason);
@@ -629,7 +646,9 @@ public async Task ModifyPositionInCategoryAsync(int position, string reason = nu
 					? position
 					: isUp
 						? x.Position <= position && x.Position > this.Position ? x.Position - 1 : x.Position
-						: x.Position >= position && x.Position < this.Position ? x.Position + 1 : x.Position
+						: x.Position >= position && x.Position < this.Position
+							? x.Position + 1
+							: x.Position
 			}
 		);
 
@@ -653,15 +672,14 @@ internal void Initialize(BaseDiscordClient client)
 			xo.Discord = this.Discord;
 			xo.ChannelId = this.Id;
 		}
+
 		if (this.InternalAvailableTags != null)
-		{
 			foreach (var xo in this.InternalAvailableTags)
 			{
 				xo.Discord = this.Discord;
 				xo.ChannelId = this.Id;
 				xo.Channel = this;
 			}
-		}
 	}
 
 	/// <summary>
@@ -735,9 +753,8 @@ public Task ModifyParentAsync(DiscordChannel newParent, bool? lockPermissions =
 		if (newParent.Type is not ChannelType.Category)
 			throw new ArgumentException("Only category type channels can be parents.");
 
-
 		var position = this.Guild.ChannelsInternal.Values.Where(xc => xc.Type == this.Type && xc.ParentId == newParent.Id) // gets list same type channels in parent
-                            .Select(xc => xc.Position).DefaultIfEmpty(-1).Max() + 1; // returns highest position of list +1, default val: 0
+			.Select(xc => xc.Position).DefaultIfEmpty(-1).Max() + 1; // returns highest position of list +1, default val: 0
 
 		var pmds = this.Guild.ChannelsInternal.Values.Where(xc => xc.Type == this.Type)
 			.OrderBy(xc => xc.Position)
@@ -745,8 +762,7 @@ public Task ModifyParentAsync(DiscordChannel newParent, bool? lockPermissions =
 			{
 				var pmd = new RestGuildChannelNewParentPayload
 				{
-					ChannelId = x.Id,
-					Position = x.Position >= position ? x.Position + 1 : x.Position,
+					ChannelId = x.Id, Position = x.Position >= position ? x.Position + 1 : x.Position
 				};
 				if (x.Id == this.Id)
 				{
@@ -780,16 +796,17 @@ public Task RemoveParentAsync(string reason = null)
 			.OrderBy(xc => xc.Position)
 			.Select(x =>
 			{
-				var pmd = new RestGuildChannelNoParentPayload { ChannelId = x.Id };
+				var pmd = new RestGuildChannelNoParentPayload
+				{
+					ChannelId = x.Id
+				};
 				if (x.Id == this.Id)
 				{
 					pmd.Position = 1;
 					pmd.ParentId = null;
 				}
 				else
-				{
 					pmd.Position = x.Position < this.Position ? x.Position + 1 : x.Position;
-				}
 
 				return pmd;
 			});
@@ -890,8 +907,7 @@ private async Task<IReadOnlyList<DiscordMessage>> GetMessagesInternalAsync(int l
 				msgs.InsertRange(0, fetch);
 				last = fetch.FirstOrDefault()?.Id;
 			}
-		}
-		while (remaining > 0 && lastCount > 0);
+		} while (remaining > 0 && lastCount > 0);
 
 		return new ReadOnlyCollection<DiscordMessage>(msgs);
 	}
@@ -964,8 +980,7 @@ public Task<IReadOnlyList<DiscordInvite>> GetInvitesAsync() =>
 	public Task<DiscordInvite> CreateInviteAsync(int maxAge = 86400, int maxUses = 0, bool temporary = false, bool unique = false, TargetType? targetType = null, ulong? targetApplicationId = null, ulong? targetUser = null, string reason = null)
 		=> this.Discord.ApiClient.CreateChannelInviteAsync(this.Id, maxAge, maxUses, targetType, targetApplicationId, targetUser, temporary, unique, reason);
 
-
-	#region Voice Channel
+#region Voice Channel
 
 	/// <summary>
 	/// Sets a voice channels status.
@@ -988,9 +1003,10 @@ public Task SetVoiceChannelStatusAsync(string status)
 	public Task RemoveVoiceChannelStatusAsync(string reason = null)
 		=> this.Type != ChannelType.Voice ? throw new NotSupportedException("Cannot execute this request on a non-voice channel.") : this.Discord.ApiClient.ModifyVoiceChannelStatusAsync(this.Id, null);
 
-	#endregion
+#endregion
+
+#region Stage
 
-	#region Stage
 	/// <summary>
 	/// Opens a stage.
 	/// </summary>
@@ -1040,9 +1056,9 @@ public async Task CloseStageAsync(string reason = null)
 	public async Task<DiscordStageInstance> GetStageAsync()
 		=> await this.Discord.ApiClient.GetStageInstanceAsync(this.Id).ConfigureAwait(false);
 
-	#endregion
+#endregion
 
-	#region Scheduled Events
+#region Scheduled Events
 
 	/// <summary>
 	/// Creates a scheduled event based on the channel type.
@@ -1066,9 +1082,9 @@ public async Task<DiscordScheduledEvent> CreateScheduledEventAsync(string name,
 		return await this.Guild.CreateScheduledEventAsync(name, scheduledStartTime, null, this, null, description, type, coverImage, reason).ConfigureAwait(false);
 	}
 
-	#endregion
+#endregion
 
-	#region Threads
+#region Threads
 
 	/// <summary>
 	/// Creates a thread.
@@ -1114,7 +1130,8 @@ public async Task<DiscordThreadChannel> CreateThreadAsync(string name, ThreadAut
 	/// <exception cref="NotFoundException">Thrown when the guild hasn't enabled threads atm.</exception>
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
-	public async Task<DiscordThreadChannel> CreatePostAsync(string name, DiscordMessageBuilder builder, int? rateLimitPerUser = null, IEnumerable<ForumPostTag>? tags = null, string reason = null) => this.Type != ChannelType.Forum ? throw new NotSupportedException("Parent channel must be forum.") : await this.Discord.ApiClient.CreateThreadAsync(this.Id, null, name, null, null, rateLimitPerUser, tags, builder, true, reason).ConfigureAwait(false);
+	public async Task<DiscordThreadChannel> CreatePostAsync(string name, DiscordMessageBuilder builder, int? rateLimitPerUser = null, IEnumerable<ForumPostTag>? tags = null, string reason = null)
+		=> this.Type != ChannelType.Forum ? throw new NotSupportedException("Parent channel must be forum.") : await this.Discord.ApiClient.CreateThreadAsync(this.Id, null, name, null, null, rateLimitPerUser, tags, builder, true, reason).ConfigureAwait(false);
 
 	/// <summary>
 	/// Gets joined archived private threads. Can contain more threads.
@@ -1181,6 +1198,7 @@ public ForumPostTag GetForumPostTag(ulong id)
 			tag.Discord = this.Discord;
 			tag.ChannelId = this.Id;
 		}
+
 		return tag;
 	}
 
@@ -1196,17 +1214,18 @@ public ForumPostTag GetForumPostTag(ulong id)
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public async Task<DiscordChannel> CreateForumPostTagAsync(string name, DiscordEmoji emoji = null, bool moderated = false, string reason = null)
-		=> this.Type != ChannelType.Forum ? throw new NotSupportedException("Channel needs to be type of Forum") :
-		this.AvailableTags.Count == 20 ?
-		throw new NotSupportedException("Cannot have more than 20 tags in a forum channel.") :
-		await this.Discord.ApiClient.ModifyForumChannelAsync(this.Id, null, null, Optional.None, Optional.None, null, Optional.None, this.InternalAvailableTags.Append(new()
-		{
-			Name = name,
-			EmojiId = emoji != null && emoji.Id != 0 ? emoji.Id : null,
-			UnicodeEmojiString = emoji?.Id == null || emoji?.Id == 0 ? emoji?.Name ?? null : null,
-			Moderated = moderated,
-			Id = null
-		}).ToList(), Optional.None, Optional.None, Optional.None, Optional.None, Optional.None, null, Optional.None, reason).ConfigureAwait(false);
+		=> this.Type != ChannelType.Forum
+			? throw new NotSupportedException("Channel needs to be type of Forum")
+			: this.AvailableTags.Count == 20
+				? throw new NotSupportedException("Cannot have more than 20 tags in a forum channel.")
+				: await this.Discord.ApiClient.ModifyForumChannelAsync(this.Id, null, null, Optional.None, Optional.None, null, Optional.None, this.InternalAvailableTags.Append(new()
+				{
+					Name = name,
+					EmojiId = emoji != null && emoji.Id != 0 ? emoji.Id : null,
+					UnicodeEmojiString = emoji?.Id == null || emoji?.Id == 0 ? emoji?.Name ?? null : null,
+					Moderated = moderated,
+					Id = null
+				}).ToList(), Optional.None, Optional.None, Optional.None, Optional.None, Optional.None, null, Optional.None, reason).ConfigureAwait(false);
 
 	/// <summary>
 	/// Deletes a forum channel tag.
@@ -1220,7 +1239,7 @@ await this.Discord.ApiClient.ModifyForumChannelAsync(this.Id, null, null, Option
 	public async Task<DiscordChannel> DeleteForumPostTag(ulong id, string reason = null)
 		=> this.Type != ChannelType.Forum ? throw new NotSupportedException("Channel needs to be type of Forum") : await this.Discord.ApiClient.ModifyForumChannelAsync(this.Id, null, null, Optional.None, Optional.None, null, Optional.None, this.InternalAvailableTags?.Where(x => x.Id != id)?.ToList(), Optional.None, Optional.None, Optional.None, Optional.None, Optional.None, null, Optional.None, reason).ConfigureAwait(false);
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Adds a channel permission overwrite for specified role.
@@ -1236,7 +1255,6 @@ public async Task<DiscordChannel> DeleteForumPostTag(ulong id, string reason = n
 	public Task AddOverwriteAsync(DiscordRole role, Permissions allow = Permissions.None, Permissions deny = Permissions.None, string reason = null)
 		=> this.Discord.ApiClient.EditChannelPermissionsAsync(this.Id, role.Id, allow, deny, "role", reason);
 
-
 	/// <summary>
 	/// Adds a channel permission overwrite for specified member.
 	/// </summary>
@@ -1462,9 +1480,11 @@ public override string ToString() =>
 				? $"Channel #{this.Name} ({this.Id})"
 				: this.IsVoiceJoinable()
 					? $"Channel #!{this.Name} ({this.Id})"
-					: !string.IsNullOrWhiteSpace(this.Name) ? $"Channel {this.Name} ({this.Id})" : $"Channel {this.Id}";
+					: !string.IsNullOrWhiteSpace(this.Name)
+						? $"Channel {this.Name} ({this.Id})"
+						: $"Channel {this.Id}";
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Checks whether this <see cref="DiscordChannel"/> is equal to another object.
@@ -1500,7 +1520,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Channel/DiscordGuildDirectoryChannel.cs b/DisCatSharp/Entities/Channel/DiscordGuildDirectoryChannel.cs
index 031147c2c4..4e5db9068a 100644
--- a/DisCatSharp/Entities/Channel/DiscordGuildDirectoryChannel.cs
+++ b/DisCatSharp/Entities/Channel/DiscordGuildDirectoryChannel.cs
@@ -21,9 +21,9 @@ internal DiscordGuildDirectoryChannel()
 	public IReadOnlyList<DiscordGuildDirectoryEntry> Entries =>
 		this.Guild.ChannelsInternal.Values.Where(e => e.ParentId == this.Id).Select(x => x as DiscordGuildDirectoryEntry).ToList();
 
-	#region Methods
+#region Methods
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Checks whether this <see cref="DiscordGuildDirectoryChannel"/> is equal to another object.
@@ -59,7 +59,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Channel/DiscordGuildDirectoryEntry.cs b/DisCatSharp/Entities/Channel/DiscordGuildDirectoryEntry.cs
index 466d556341..d52958537b 100644
--- a/DisCatSharp/Entities/Channel/DiscordGuildDirectoryEntry.cs
+++ b/DisCatSharp/Entities/Channel/DiscordGuildDirectoryEntry.cs
@@ -11,7 +11,6 @@ namespace DisCatSharp.Entities;
 /// </summary>
 public class DiscordGuildDirectoryEntry : DiscordChannel, IEquatable<DiscordGuildDirectoryEntry>
 {
-
 	/// <summary>
 	/// Gets the description of the directory entry.
 	/// </summary>
@@ -30,9 +29,9 @@ public class DiscordGuildDirectoryEntry : DiscordChannel, IEquatable<DiscordGuil
 	internal DiscordGuildDirectoryEntry()
 	{ }
 
-	#region Methods
+#region Methods
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Checks whether this <see cref="DiscordGuildDirectoryEntry"/> is equal to another object.
@@ -68,7 +67,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Channel/Overwrite/DiscordOverwrite.cs b/DisCatSharp/Entities/Channel/Overwrite/DiscordOverwrite.cs
index 2434c03298..d10c969b3d 100644
--- a/DisCatSharp/Entities/Channel/Overwrite/DiscordOverwrite.cs
+++ b/DisCatSharp/Entities/Channel/Overwrite/DiscordOverwrite.cs
@@ -34,7 +34,7 @@ public class DiscordOverwrite : SnowflakeObject
 	[JsonIgnore]
 	internal ulong ChannelId;
 
-	#region Methods
+#region Methods
 
 	/// <summary>
 	/// Deletes this channel overwrite.
@@ -91,7 +91,7 @@ public async Task<DiscordRole> GetRoleAsync() =>
 	public DiscordOverwriteBuilder ConvertToBuilder()
 		=> new(this);
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="DiscordOverwrite"/> class.
@@ -107,7 +107,9 @@ internal DiscordOverwrite()
 	public PermissionLevel CheckPermission(Permissions permission) =>
 		(this.Allowed & permission) != 0
 			? PermissionLevel.Allowed
-			: (this.Denied & permission) != 0 ? PermissionLevel.Denied : PermissionLevel.Unset;
+			: (this.Denied & permission) != 0
+				? PermissionLevel.Denied
+				: PermissionLevel.Unset;
 
 	/// <summary>
 	/// Automatically converts this <see cref="DiscordOverwrite"/> to a <see cref="DiscordOverwriteBuilder"/>.
diff --git a/DisCatSharp/Entities/Channel/Overwrite/DiscordOverwriteBuilder.cs b/DisCatSharp/Entities/Channel/Overwrite/DiscordOverwriteBuilder.cs
index af5c741dc1..d29c9be641 100644
--- a/DisCatSharp/Entities/Channel/Overwrite/DiscordOverwriteBuilder.cs
+++ b/DisCatSharp/Entities/Channel/Overwrite/DiscordOverwriteBuilder.cs
@@ -157,15 +157,10 @@ public DiscordOverwriteBuilder For(DiscordRole role)
 	/// </summary>
 	/// <returns>Use this object for creation of new overwrites.</returns>
 	internal DiscordRestOverwrite Build()
-	{
-		return new()
+		=> new()
 		{
-			Allow = this.Allowed,
-			Deny = this.Denied,
-			Id = this.Target,
-			Type = this.Type,
+			Allow = this.Allowed, Deny = this.Denied, Id = this.Target, Type = this.Type
 		};
-	}
 }
 
 public static class DiscordOverwriteBuilderExtensions
@@ -185,7 +180,10 @@ public static List<DiscordOverwriteBuilder> Merge(this IEnumerable<DiscordOverwr
 		var newList = builderList.ToList();
 
 		if (!newList.Any(x => x.Target == target && x.Type == type))
-			newList.Add(new() { Type = type, Target = target });
+			newList.Add(new()
+			{
+				Type = type, Target = target
+			});
 
 		var discordOverwriteBuilder = newList.First(x => x.Target == target && x.Type == type);
 		discordOverwriteBuilder.Allow(allowed);
diff --git a/DisCatSharp/Entities/Color/DiscordColor.Colors.cs b/DisCatSharp/Entities/Color/DiscordColor.Colors.cs
index 87cce6c09c..77240f1586 100644
--- a/DisCatSharp/Entities/Color/DiscordColor.Colors.cs
+++ b/DisCatSharp/Entities/Color/DiscordColor.Colors.cs
@@ -1,9 +1,9 @@
-
 namespace DisCatSharp.Entities;
 
 public readonly partial struct DiscordColor
 {
-	#region Black and White
+#region Black and White
+
 	/// <summary>
 	/// Represents no color, or integer 0;
 	/// </summary>
@@ -38,9 +38,11 @@ public readonly partial struct DiscordColor
 	/// Very dark gray, or #666666.
 	/// </summary>
 	public static DiscordColor VeryDarkGray { get; } = new(0x666666);
-	#endregion
 
-	#region Discord branding colors
+#endregion
+
+#region Discord branding colors
+
 	// See https://discord.com/branding.
 
 	/// <summary>
@@ -67,9 +69,11 @@ public readonly partial struct DiscordColor
 	/// Discord Red, or #ED4245.
 	/// </summary>
 	public static DiscordColor Red { get; } = new(0xED4245);
-	#endregion
 
-	#region Other colors
+#endregion
+
+#region Other colors
+
 	/// <summary>
 	/// Dark red, or #7F0000.
 	/// </summary>
@@ -217,5 +221,6 @@ public readonly partial struct DiscordColor
 	/// Sienna, or #882D17.
 	/// </summary>
 	public static DiscordColor Sienna { get; } = new(0x882D17);
-	#endregion
+
+#endregion
 }
diff --git a/DisCatSharp/Entities/Color/DiscordColor.cs b/DisCatSharp/Entities/Color/DiscordColor.cs
index 36cf08d7a7..31013e3108 100644
--- a/DisCatSharp/Entities/Color/DiscordColor.cs
+++ b/DisCatSharp/Entities/Color/DiscordColor.cs
@@ -9,7 +9,10 @@ namespace DisCatSharp.Entities;
 /// </summary>
 public partial struct DiscordColor
 {
-	private static readonly char[] s_hexAlphabet = new[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+	private static readonly char[] s_hexAlphabet = new[]
+	{
+		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+	};
 
 	/// <summary>
 	/// Gets the integer representation of this color.
@@ -20,13 +23,13 @@ public partial struct DiscordColor
 	/// Gets the red component of this color as an 8-bit integer.
 	/// </summary>
 	public byte R
-		=> (byte)((this.Value >> 16) & 0xFF);
+		=> (byte)(this.Value >> 16 & 0xFF);
 
 	/// <summary>
 	/// Gets the green component of this color as an 8-bit integer.
 	/// </summary>
 	public byte G
-		=> (byte)((this.Value >> 8) & 0xFF);
+		=> (byte)(this.Value >> 8 & 0xFF);
 
 	/// <summary>
 	/// Gets the blue component of this color as an 8-bit integer.
@@ -51,7 +54,7 @@ public DiscordColor(int color)
 	/// <param name="b">Value of the blue component.</param>
 	public DiscordColor(byte r, byte g, byte b)
 	{
-		this.Value = (r << 16) | (g << 8) | b;
+		this.Value = r << 16 | g << 8 | b;
 	}
 
 	/// <summary>
@@ -69,7 +72,7 @@ public DiscordColor(float r, float g, float b)
 		var gb = (byte)(g * 255);
 		var bb = (byte)(b * 255);
 
-		this.Value = (rb << 16) | (gb << 8) | bb;
+		this.Value = rb << 16 | gb << 8 | bb;
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/DCS/DisCatSharpTeam.cs b/DisCatSharp/Entities/DCS/DisCatSharpTeam.cs
index 06dd2de3be..b9d8e00187 100644
--- a/DisCatSharp/Entities/DCS/DisCatSharpTeam.cs
+++ b/DisCatSharp/Entities/DCS/DisCatSharpTeam.cs
@@ -154,7 +154,6 @@ internal static async Task<DisCatSharpTeam> Get(HttpClient http, ILogger logger,
 					team.Add(owner);
 				}
 				else
-				{
 					team.Add(new()
 					{
 						Id = user.Id,
@@ -164,7 +163,6 @@ internal static async Task<DisCatSharpTeam> Get(HttpClient http, ILogger logger,
 						BannerHash = tuser.BannerHash,
 						BannerColorInternal = tuser.BannerColorInternal
 					});
-				}
 			}
 
 			dcst.Owner = owner;
diff --git a/DisCatSharp/Entities/DiscordLocales.cs b/DisCatSharp/Entities/DiscordLocales.cs
index 8514453a8f..27898f8bfd 100644
--- a/DisCatSharp/Entities/DiscordLocales.cs
+++ b/DisCatSharp/Entities/DiscordLocales.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Entities;
 
 public static class DiscordLocales
diff --git a/DisCatSharp/Entities/DiscordProtocol.cs b/DisCatSharp/Entities/DiscordProtocol.cs
index 05ea21ef8e..420982aa54 100644
--- a/DisCatSharp/Entities/DiscordProtocol.cs
+++ b/DisCatSharp/Entities/DiscordProtocol.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Entities;
 
 /// <summary>
@@ -6,9 +5,9 @@ namespace DisCatSharp.Entities;
 /// </summary>
 public class DiscordProtocol
 {
-	#region Properties
+#region Properties
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="DiscordProtocol"/> class.
@@ -16,7 +15,7 @@ public class DiscordProtocol
 	public DiscordProtocol()
 	{ }
 
-	#region Methods
+#region Methods
 
-	#endregion
+#endregion
 }
diff --git a/DisCatSharp/Entities/DiscordUri.cs b/DisCatSharp/Entities/DiscordUri.cs
index 5c5f5bae6d..cd6dff1717 100644
--- a/DisCatSharp/Entities/DiscordUri.cs
+++ b/DisCatSharp/Entities/DiscordUri.cs
@@ -97,18 +97,22 @@ internal sealed class DiscordUriJsonConverter : JsonConverter
 		/// <param name="objectType">The object type.</param>
 		/// <param name="existingValue">The existing value.</param>
 		/// <param name="serializer">The serializer.</param>
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
-			JsonSerializer serializer)
+		public override object ReadJson(
+			JsonReader reader,
+			Type objectType,
+			object existingValue,
+			JsonSerializer serializer
+		)
 		{
 			var val = reader.Value;
 			return val == null
 				? null
 				: val is not string s
-				? throw new JsonReaderException("DiscordUri value invalid format! This is a bug in DisCatSharp. " +
-											  $"Include the type in your bug report: [[{reader.TokenType}]]")
-				: IsStandard(s)
-				? new(new Uri(s))
-				: new DiscordUri(s);
+					? throw new JsonReaderException("DiscordUri value invalid format! This is a bug in DisCatSharp. " +
+					                                $"Include the type in your bug report: [[{reader.TokenType}]]")
+					: IsStandard(s)
+						? new(new Uri(s))
+						: new DiscordUri(s);
 		}
 
 		/// <summary>
diff --git a/DisCatSharp/Entities/Embed/DiscordEmbed.cs b/DisCatSharp/Entities/Embed/DiscordEmbed.cs
index 0783e7f2ff..94dd7d324a 100644
--- a/DisCatSharp/Entities/Embed/DiscordEmbed.cs
+++ b/DisCatSharp/Entities/Embed/DiscordEmbed.cs
@@ -49,6 +49,7 @@ public Optional<DiscordColor> Color
 
 	[JsonProperty("color", NullValueHandling = NullValueHandling.Include)]
 	internal Optional<int> ColorInternal;
+
 	[JsonIgnore]
 	private readonly Lazy<Optional<DiscordColor>> _colorLazy;
 
diff --git a/DisCatSharp/Entities/Embed/DiscordEmbedBuilder.cs b/DisCatSharp/Entities/Embed/DiscordEmbedBuilder.cs
index e9ff37c88b..481df91bd5 100644
--- a/DisCatSharp/Entities/Embed/DiscordEmbedBuilder.cs
+++ b/DisCatSharp/Entities/Embed/DiscordEmbedBuilder.cs
@@ -22,9 +22,11 @@ public string Title
 		{
 			if (value != null && value.Length > 256)
 				throw new ArgumentException("Title length cannot exceed 256 characters.", nameof(value));
+
 			this._title = value;
 		}
 	}
+
 	private string _title;
 
 	/// <summary>
@@ -37,9 +39,11 @@ public string Description
 		{
 			if (value != null && value.Length > 4096)
 				throw new ArgumentException("Description length cannot exceed 4096 characters.", nameof(value));
+
 			this._description = value;
 		}
 	}
+
 	private string _description;
 
 	/// <summary>
@@ -50,6 +54,7 @@ public string Url
 		get => this._url?.ToString();
 		set => this._url = string.IsNullOrEmpty(value) ? null : new Uri(value);
 	}
+
 	private Uri _url;
 
 	/// <summary>
@@ -70,6 +75,7 @@ public string ImageUrl
 		get => this._imageUri?.ToString();
 		set => this._imageUri = string.IsNullOrEmpty(value) ? null : new DiscordUri(value);
 	}
+
 	private DiscordUri _imageUri;
 
 	/// <summary>
@@ -91,6 +97,7 @@ public string ImageUrl
 	/// Gets the embed's fields.
 	/// </summary>
 	public IReadOnlyList<DiscordEmbedField> Fields { get; }
+
 	private readonly List<DiscordEmbedField> _fields = new();
 
 	/// <summary>
@@ -118,24 +125,19 @@ public DiscordEmbedBuilder(DiscordEmbed original)
 		if (original.Thumbnail != null)
 			this.Thumbnail = new()
 			{
-				Url = original.Thumbnail.Url?.ToString(),
-				Height = original.Thumbnail.Height,
-				Width = original.Thumbnail.Width
+				Url = original.Thumbnail.Url?.ToString(), Height = original.Thumbnail.Height, Width = original.Thumbnail.Width
 			};
 
 		if (original.Author != null)
 			this.Author = new()
 			{
-				IconUrl = original.Author.IconUrl?.ToString(),
-				Name = original.Author.Name,
-				Url = original.Author.Url?.ToString()
+				IconUrl = original.Author.IconUrl?.ToString(), Name = original.Author.Name, Url = original.Author.Url?.ToString()
 			};
 
 		if (original.Footer != null)
 			this.Footer = new()
 			{
-				IconUrl = original.Footer.IconUrl?.ToString(),
-				Text = original.Footer.Text
+				IconUrl = original.Footer.IconUrl?.ToString(), Text = original.Footer.Text
 			};
 
 		if (original.Fields?.Any() == true)
@@ -266,9 +268,7 @@ public DiscordEmbedBuilder WithThumbnail(string url, int height = 0, int width =
 	{
 		this.Thumbnail = new()
 		{
-			Url = url,
-			Height = height,
-			Width = width
+			Url = url, Height = height, Width = width
 		};
 
 		return this;
@@ -285,9 +285,7 @@ public DiscordEmbedBuilder WithThumbnail(Uri url, int height = 0, int width = 0)
 	{
 		this.Thumbnail = new()
 		{
-			Uri = new(url),
-			Height = height,
-			Width = width
+			Uri = new(url), Height = height, Width = width
 		};
 
 		return this;
@@ -304,13 +302,12 @@ public DiscordEmbedBuilder WithAuthor(string name = null, string url = null, str
 	{
 		if (!string.IsNullOrEmpty(name) && name.Length > 256)
 			throw new NotSupportedException("Embed author name can not exceed 256 chars. See https://discord.com/developers/docs/resources/channel#embed-limits.");
+
 		this.Author = string.IsNullOrEmpty(name) && string.IsNullOrEmpty(url) && string.IsNullOrEmpty(iconUrl)
 			? null
 			: new EmbedAuthor
 			{
-				Name = name,
-				Url = url,
-				IconUrl = iconUrl
+				Name = name, Url = url, IconUrl = iconUrl
 			};
 		return this;
 	}
@@ -330,8 +327,7 @@ public DiscordEmbedBuilder WithFooter(string text = null, string iconUrl = null)
 			? null
 			: new EmbedFooter
 			{
-				Text = text,
-				IconUrl = iconUrl
+				Text = text, IconUrl = iconUrl
 			};
 		return this;
 	}
@@ -451,39 +447,35 @@ public DiscordEmbed Build()
 		if (this.Footer != null)
 			embed.Footer = new()
 			{
-				Text = this.Footer.Text,
-				IconUrl = this.Footer.IconUri
+				Text = this.Footer.Text, IconUrl = this.Footer.IconUri
 			};
 
 		if (this.Author != null)
 			embed.Author = new()
 			{
-				Name = this.Author.Name,
-				Url = this.Author.Uri,
-				IconUrl = this.Author.IconUri
+				Name = this.Author.Name, Url = this.Author.Uri, IconUrl = this.Author.IconUri
 			};
 
 		if (this._imageUri != null)
-			embed.Image = new() { Url = this._imageUri };
+			embed.Image = new()
+			{
+				Url = this._imageUri
+			};
 		if (this.Thumbnail != null)
 			embed.Thumbnail = new()
 			{
-				Url = this.Thumbnail.Uri,
-				Height = this.Thumbnail.Height,
-				Width = this.Thumbnail.Width
+				Url = this.Thumbnail.Uri, Height = this.Thumbnail.Height, Width = this.Thumbnail.Width
 			};
 
 		embed.Fields = new ReadOnlyCollection<DiscordEmbedField>(new List<DiscordEmbedField>(this._fields)); // copy the list, don't wrap it, prevents mutation
 
 		var charCount = 0;
 		if (embed.Fields.Any())
-		{
 			foreach (var field in embed.Fields)
 			{
 				charCount += field.Name.Length;
 				charCount += field.Value.Length;
 			}
-		}
 
 		if (embed.Author != null && !string.IsNullOrEmpty(embed.Author.Name))
 			charCount += embed.Author.Name.Length;
@@ -524,9 +516,11 @@ public string Name
 			{
 				if (value != null && value.Length > 256)
 					throw new ArgumentException("Author name length cannot exceed 256 characters.", nameof(value));
+
 				this._name = value;
 			}
 		}
+
 		private string _name;
 
 		/// <summary>
@@ -537,6 +531,7 @@ public string Url
 			get => this.Uri?.ToString();
 			set => this.Uri = string.IsNullOrEmpty(value) ? null : new Uri(value);
 		}
+
 		internal Uri Uri;
 
 		/// <summary>
@@ -547,6 +542,7 @@ public string IconUrl
 			get => this.IconUri?.ToString();
 			set => this.IconUri = string.IsNullOrEmpty(value) ? null : new DiscordUri(value);
 		}
+
 		internal DiscordUri IconUri;
 	}
 
@@ -565,9 +561,11 @@ public string Text
 			{
 				if (value != null && value.Length > 2048)
 					throw new ArgumentException("Footer text length cannot exceed 2048 characters.", nameof(value));
+
 				this._text = value;
 			}
 		}
+
 		private string _text;
 
 		/// <summary>
@@ -578,6 +576,7 @@ public string IconUrl
 			get => this.IconUri?.ToString();
 			set => this.IconUri = string.IsNullOrEmpty(value) ? null : new DiscordUri(value);
 		}
+
 		internal DiscordUri IconUri;
 	}
 
@@ -594,6 +593,7 @@ public string Url
 			get => this.Uri?.ToString();
 			set => this.Uri = string.IsNullOrEmpty(value) ? null : new DiscordUri(value);
 		}
+
 		internal DiscordUri Uri;
 
 		/// <summary>
@@ -604,6 +604,7 @@ public int Height
 			get => this._height;
 			set => this._height = value >= 0 ? value : 0;
 		}
+
 		private int _height;
 
 		/// <summary>
@@ -614,6 +615,7 @@ public int Width
 			get => this._width;
 			set => this._width = value >= 0 ? value : 0;
 		}
+
 		private int _width;
 	}
 }
diff --git a/DisCatSharp/Entities/Embed/DiscordEmbedField.cs b/DisCatSharp/Entities/Embed/DiscordEmbedField.cs
index f14d31dea8..c18b9cf3cb 100644
--- a/DisCatSharp/Entities/Embed/DiscordEmbedField.cs
+++ b/DisCatSharp/Entities/Embed/DiscordEmbedField.cs
@@ -25,6 +25,7 @@ public string Name
 			{
 				if (value == null)
 					throw new ArgumentNullException(nameof(value));
+
 				throw new ArgumentException("Name cannot be empty or whitespace.", nameof(value));
 			}
 
@@ -51,6 +52,7 @@ public string Value
 			{
 				if (value == null)
 					throw new ArgumentNullException(nameof(value));
+
 				throw new ArgumentException("Value cannot be empty or whitespace.", nameof(value));
 			}
 
diff --git a/DisCatSharp/Entities/Emoji/DiscordEmoji.EmojiUtils.cs b/DisCatSharp/Entities/Emoji/DiscordEmoji.EmojiUtils.cs
index 6af437c696..41b916cd56 100644
--- a/DisCatSharp/Entities/Emoji/DiscordEmoji.EmojiUtils.cs
+++ b/DisCatSharp/Entities/Emoji/DiscordEmoji.EmojiUtils.cs
@@ -22,7 +22,8 @@ public partial class DiscordEmoji
 	/// </summary>
 	static DiscordEmoji()
 	{
-		#region Generated Emoji Map
+#region Generated Emoji Map
+
 		s_unicodeEmojis = new Dictionary<string, string>
 		{
 			[":100:"] = "\U0001f4af",
@@ -6676,7 +6677,7 @@ static DiscordEmoji()
 			[":zipper_mouth:"] = "\U0001f910",
 			[":zipper_mouth_face:"] = "\U0001f910",
 			[":zombie:"] = "\U0001f9df",
-			[":zzz:"] = "\U0001f4a4",
+			[":zzz:"] = "\U0001f4a4"
 		};
 
 		s_discordNameLookup = new Dictionary<string, string>
@@ -10119,8 +10120,9 @@ static DiscordEmoji()
 			["\u0030\u20e3"] = ":zero:",
 			["\U0001f910"] = ":zipper_mouth:",
 			["\U0001f9df"] = ":zombie:",
-			["\U0001f4a4"] = ":zzz:",
+			["\U0001f4a4"] = ":zzz:"
 		};
-		#endregion
+
+#endregion
 	}
 }
diff --git a/DisCatSharp/Entities/Emoji/DiscordEmoji.cs b/DisCatSharp/Entities/Emoji/DiscordEmoji.cs
index 30d5c3cc98..7fe057657a 100644
--- a/DisCatSharp/Entities/Emoji/DiscordEmoji.cs
+++ b/DisCatSharp/Entities/Emoji/DiscordEmoji.cs
@@ -126,7 +126,7 @@ public override bool Equals(object obj)
 	/// <param name="e"><see cref="DiscordEmoji"/> to compare to.</param>
 	/// <returns>Whether the <see cref="DiscordEmoji"/> is equal to this <see cref="DiscordEmoji"/>.</returns>
 	public bool Equals(DiscordEmoji e)
-		=> e is not null && (ReferenceEquals(this, e) || (this.Id == e.Id && this.Name == e.Name));
+		=> e is not null && (ReferenceEquals(this, e) || this.Id == e.Id && this.Name == e.Name);
 
 	/// <summary>
 	/// Gets the hash code for this <see cref="DiscordEmoji"/>.
@@ -135,8 +135,8 @@ public bool Equals(DiscordEmoji e)
 	public override int GetHashCode()
 	{
 		var hash = 13;
-		hash = (hash * 7) + this.Id.GetHashCode();
-		hash = (hash * 7) + this.Name.GetHashCode();
+		hash = hash * 7 + this.Id.GetHashCode();
+		hash = hash * 7 + this.Name.GetHashCode();
 
 		return hash;
 	}
@@ -158,7 +158,7 @@ internal string ToReactionString()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || (e1.Id == e2.Id && e1.Name == e2.Name));
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id && e1.Name == e2.Name);
 	}
 
 	/// <summary>
@@ -194,7 +194,10 @@ public static bool IsValidUnicode(string unicodeEntity)
 	public static DiscordEmoji FromUnicode(BaseDiscordClient client, string unicodeEntity)
 		=> !IsValidUnicode(unicodeEntity)
 			? throw new ArgumentException("Specified unicode entity is not a valid unicode emoji.", nameof(unicodeEntity))
-			: new DiscordEmoji { Name = unicodeEntity, Discord = client };
+			: new DiscordEmoji
+			{
+				Name = unicodeEntity, Discord = client
+			};
 
 	/// <summary>
 	/// Creates an emoji object from a unicode entity.
@@ -223,7 +226,10 @@ public static bool TryFromUnicode(BaseDiscordClient client, string unicodeEntity
 		if (!s_unicodeEmojis.TryGetValue(discordName, out unicodeEntity))
 			return false;
 
-		emoji = new() { Name = unicodeEntity, Discord = client };
+		emoji = new()
+		{
+			Name = unicodeEntity, Discord = client
+		};
 		return true;
 	}
 
@@ -248,10 +254,8 @@ public static DiscordEmoji FromGuildEmote(BaseDiscordClient client, ulong id)
 			throw new ArgumentNullException(nameof(client), "Client cannot be null.");
 
 		foreach (var guild in client.Guilds.Values)
-		{
 			if (guild.Emojis.TryGetValue(id, out var found))
 				return found;
-		}
 
 		throw new KeyNotFoundException("Given emote was not found.");
 	}
@@ -269,10 +273,8 @@ public static bool TryFromGuildEmote(BaseDiscordClient client, ulong id, out Dis
 			throw new ArgumentNullException(nameof(client), "Client cannot be null.");
 
 		foreach (var guild in client.Guilds.Values)
-		{
 			if (guild.Emojis.TryGetValue(id, out emoji))
 				return true;
-		}
 
 		emoji = null;
 		return false;
@@ -296,7 +298,10 @@ public static DiscordEmoji FromName(BaseDiscordClient client, string name, bool
 			throw new ArgumentNullException(nameof(name), "Name cannot be empty or null.");
 
 		if (s_unicodeEmojis.TryGetValue(name, out var unicodeEntity))
-			return new() { Discord = client, Name = unicodeEntity };
+			return new()
+			{
+				Discord = client, Name = unicodeEntity
+			};
 
 		if (includeGuilds)
 		{
@@ -344,7 +349,10 @@ public static bool TryFromName(BaseDiscordClient client, string name, bool inclu
 
 		if (s_unicodeEmojis.TryGetValue(name, out var unicodeEntity))
 		{
-			emoji = new() { Discord = client, Name = unicodeEntity };
+			emoji = new()
+			{
+				Discord = client, Name = unicodeEntity
+			};
 			return true;
 		}
 
diff --git a/DisCatSharp/Entities/Emoji/DiscordUnicodeEmoji.cs b/DisCatSharp/Entities/Emoji/DiscordUnicodeEmoji.cs
index 87cd4218bf..bd9ecce5a2 100644
--- a/DisCatSharp/Entities/Emoji/DiscordUnicodeEmoji.cs
+++ b/DisCatSharp/Entities/Emoji/DiscordUnicodeEmoji.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Entities;
 
 /// <summary>
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ApplicationCommandPermissionUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ApplicationCommandPermissionUpdateChangeSet.cs
new file mode 100644
index 0000000000..032993333e
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ApplicationCommandPermissionUpdateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating permissions for an application command.
+/// </summary>
+public sealed class ApplicationCommandPermissionUpdateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationBlockMessageChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationBlockMessageChangeSet.cs
new file mode 100644
index 0000000000..902b6ea8ea
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationBlockMessageChangeSet.cs
@@ -0,0 +1,43 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for a message being blocked by Auto Moderation.
+/// </summary>
+public sealed class AutoModerationBlockMessageChangeSet : DiscordAuditLogEntry
+{
+	public AutoModerationBlockMessageChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.AutoModerationBlockMessage;
+	}
+
+	/// <summary>
+	/// The rule's name that blocked the message.
+	/// </summary>
+	public string RuleName => this.Options.AutoModerationRuleName;
+
+	/// <summary>
+	/// What type of filter the rule uses.
+	/// </summary>
+	public AutomodTriggerType? TriggerType => this.Options.AutoModerationRuleTriggerType;
+
+	/// <summary>
+	/// The channel's id in which the rule triggered.
+	/// </summary>
+	public ulong? ChannelId => this.Options.ChannelId!.Value;
+
+	/// <summary>
+	/// The channel in which the rule triggered.
+	/// </summary>
+	public DiscordChannel Channel => this.Options.Channel;
+
+	/// <summary>
+	/// The member that was timed out.
+	/// </summary>
+	public DiscordMember TargetMember => this.Discord.Guilds[this.GuildId].Members[this.TargetId.Value!];
+
+	/// <inheritdoc />
+	internal override string? ChangeDescription
+		=> $"Automod blocked a message from being sended in {this.Channel} from {this.TargetMember} for reason {this.Reason ?? "No reason given".Italic()}";
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationFlagToChannelChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationFlagToChannelChangeSet.cs
new file mode 100644
index 0000000000..f317abfa14
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationFlagToChannelChangeSet.cs
@@ -0,0 +1,43 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for a message being flagged by Auto Moderation.
+/// </summary>
+public sealed class AutoModerationFlagToChannelChangeSet : DiscordAuditLogEntry
+{
+	public AutoModerationFlagToChannelChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.AutoModerationFlagToChannel;
+	}
+
+	/// <summary>
+	/// The rule's name that blocked the message.
+	/// </summary>
+	public string RuleName => this.Options.AutoModerationRuleName;
+
+	/// <summary>
+	/// What type of filter the rule uses.
+	/// </summary>
+	public AutomodTriggerType? TriggerType => this.Options.AutoModerationRuleTriggerType;
+
+	/// <summary>
+	/// The channel's id in which the rule triggered.
+	/// </summary>
+	public ulong? ChannelId => this.Options.ChannelId!.Value;
+
+	/// <summary>
+	/// The channel in which the rule triggered.
+	/// </summary>
+	public DiscordChannel Channel => this.Options.Channel;
+
+	/// <summary>
+	/// The member that was timed out.
+	/// </summary>
+	public DiscordMember TargetMember => this.Discord.Guilds[this.GuildId].Members[this.TargetId.Value!];
+
+	/// <inheritdoc />
+	internal override string? ChangeDescription
+		=> $"Automod flagged a message in {this.Channel} from {this.TargetMember} for reason {this.Reason ?? "No reason given".Italic()}";
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationRuleCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationRuleCreateChangeSet.cs
new file mode 100644
index 0000000000..ec01c5e310
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationRuleCreateChangeSet.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for creating an Auto Moderation rule.
+/// </summary>
+public sealed class AutoModerationRuleCreateChangeSet : DiscordAuditLogEntry
+{
+	public AutoModerationRuleCreateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.AutoModerationRuleCreate;
+	}
+
+	public bool Enabled => (bool)this.Changes.FirstOrDefault(x => x.Key == "enabled")?.NewValue;
+	public string RuleName => (string)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+	public AutomodTriggerType TriggerType => (AutomodTriggerType)this.Changes.FirstOrDefault(x => x.Key == "trigger_type")?.NewValue;
+	public AutomodEventType EventType => (AutomodEventType)this.Changes.FirstOrDefault(x => x.Key == "event_type")?.NewValue;
+	public AutomodAction[] Actions => (AutomodAction[])this.Changes.FirstOrDefault(x => x.Key == "actions")?.NewValue;
+	public AutomodTriggerMetadata TriggerMetadata => (AutomodTriggerMetadata)this.Changes.FirstOrDefault(x => x.Key == "trigger_metadata")?.NewValue;
+
+	public IReadOnlyList<ulong>? ExemptRoleIds => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "exempt_roles")?.NewValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public IEnumerable<DiscordRole> ExemptRoles => this.ExemptRoleIds.Select(x => this.Discord.Guilds[this.GuildId].Roles[x]);
+
+	public IReadOnlyList<ulong>? ExemptChannelIds => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "exempt_channels")?.NewValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public IEnumerable<DiscordChannel> ExemptChannels => this.ExemptChannelIds.Select(x => this.Discord.Guilds[this.GuildId].Channels[x]);
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationRuleDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationRuleDeleteChangeSet.cs
new file mode 100644
index 0000000000..56ef5d9379
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationRuleDeleteChangeSet.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting an Auto Moderation rule.
+/// </summary>
+public sealed class AutoModerationRuleDeleteChangeSet : DiscordAuditLogEntry
+{
+	public AutoModerationRuleDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.AutoModerationRuleDelete;
+	}
+
+	public bool Enabled => (bool)this.Changes.FirstOrDefault(x => x.Key == "enabled")?.OldValue;
+	public string RuleName => (string)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public AutomodTriggerType TriggerType => (AutomodTriggerType)this.Changes.FirstOrDefault(x => x.Key == "trigger_type")?.OldValue;
+	public AutomodEventType EventType => (AutomodEventType)this.Changes.FirstOrDefault(x => x.Key == "event_type")?.OldValue;
+	public AutomodAction[] Actions => (AutomodAction[])this.Changes.FirstOrDefault(x => x.Key == "actions")?.OldValue;
+	public AutomodTriggerMetadata TriggerMetadata => (AutomodTriggerMetadata)this.Changes.FirstOrDefault(x => x.Key == "trigger_metadata")?.OldValue;
+
+	public IReadOnlyList<ulong>? ExemptRoleIds => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "exempt_roles")?.OldValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public IEnumerable<DiscordRole> ExemptRoles => this.ExemptRoleIds.Select(x => this.Discord.Guilds[this.GuildId].Roles[x]);
+
+	public IReadOnlyList<ulong>? ExemptChannelIds => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "exempt_channels")?.OldValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public IEnumerable<DiscordChannel> ExemptChannels => this.ExemptChannelIds.Select(x => this.Discord.Guilds[this.GuildId].Channels[x]);
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationRuleUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationRuleUpdateChangeSet.cs
new file mode 100644
index 0000000000..ffa94d5d80
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationRuleUpdateChangeSet.cs
@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating an Auto Moderation rule.
+/// </summary>
+public sealed class AutoModerationRuleUpdateChangeSet : DiscordAuditLogEntry
+{
+	public AutoModerationRuleUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.AutoModerationRuleUpdate;
+	}
+
+	public bool EnabledChanged => this.EnabledBefore is not null || this.EnabledAfter is not null;
+	public bool? EnabledBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "enabled")?.OldValue;
+	public bool? EnabledAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "enabled")?.NewValue;
+
+	public bool RuleNameChanged => this.RuleNameBefore is not null || this.RuleNameAfter is not null;
+	public string? RuleNameBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public string? RuleNameAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+
+	public bool TriggerTypeChanged => this.TriggerTypeBefore is not null || this.TriggerTypeAfter is not null;
+	public AutomodTriggerType? TriggerTypeBefore => (AutomodTriggerType?)this.Changes.FirstOrDefault(x => x.Key == "trigger_type")?.OldValue;
+	public AutomodTriggerType? TriggerTypeAfter => (AutomodTriggerType?)this.Changes.FirstOrDefault(x => x.Key == "trigger_type")?.NewValue;
+
+	public bool EventTypeChanged => this.EventTypeBefore is not null || this.EventTypeAfter is not null;
+	public AutomodEventType? EventTypeBefore => (AutomodEventType?)this.Changes.FirstOrDefault(x => x.Key == "event_type")?.OldValue;
+	public AutomodEventType? EventTypeAfter => (AutomodEventType?)this.Changes.FirstOrDefault(x => x.Key == "event_type")?.NewValue;
+
+	public bool ActionsChanged => this.ActionsBefore is not null || this.ActionsAfter is not null;
+	public AutomodAction[]? ActionsBefore => (AutomodAction[]?)this.Changes.FirstOrDefault(x => x.Key == "actions")?.OldValue;
+	public AutomodAction[]? ActionsAfter => (AutomodAction[]?)this.Changes.FirstOrDefault(x => x.Key == "actions")?.NewValue;
+
+	public bool TriggerMetadataChanged => this.TriggerMetadataBefore is not null || this.TriggerMetadataAfter is not null;
+	public AutomodTriggerMetadata? TriggerMetadataBefore => (AutomodTriggerMetadata?)this.Changes.FirstOrDefault(x => x.Key == "trigger_metadata")?.OldValue;
+	public AutomodTriggerMetadata? TriggerMetadataAfter => (AutomodTriggerMetadata?)this.Changes.FirstOrDefault(x => x.Key == "trigger_metadata")?.NewValue;
+
+	public bool ExemptRoleIdsChanged => this.ExemptRoleIdsBefore is not null || this.ExemptRoleIdsAfter is not null;
+	public IReadOnlyList<ulong>? ExemptRoleIdsBefore => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "exempt_roles")?.OldValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public IReadOnlyList<ulong>? ExemptRoleIdsAfter => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "exempt_roles")?.NewValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public IEnumerable<DiscordRole> ExemptRolesBefore => this.ExemptRoleIdsBefore.Select(x => this.Discord.Guilds[this.GuildId].Roles[x]);
+	public IEnumerable<DiscordRole> ExemptRolesAfter => this.ExemptRoleIdsAfter.Select(x => this.Discord.Guilds[this.GuildId].Roles[x]);
+
+	public bool ExemptChannelIdsChanged => this.ExemptChannelIdsBefore is not null || this.ExemptChannelIdsAfter is not null;
+	public IReadOnlyList<ulong>? ExemptChannelIdsBefore => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "exempt_channels")?.OldValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public IReadOnlyList<ulong>? ExemptChannelIdsAfter => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "exempt_channels")?.NewValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public IEnumerable<DiscordChannel> ExemptChannelsBefore => this.ExemptChannelIdsBefore.Select(x => this.Discord.Guilds[this.GuildId].Channels[x]);
+	public IEnumerable<DiscordChannel> ExemptChannelsAfter => this.ExemptChannelIdsAfter.Select(x => this.Discord.Guilds[this.GuildId].Channels[x]);
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationUserCommunicationDisabledChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationUserCommunicationDisabledChangeSet.cs
new file mode 100644
index 0000000000..13ce46df72
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/AutoModerationUserCommunicationDisabledChangeSet.cs
@@ -0,0 +1,43 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for a member being timed out by Auto Moderation.
+/// </summary>
+public sealed class AutoModerationUserCommunicationDisabledChangeSet : DiscordAuditLogEntry
+{
+	public AutoModerationUserCommunicationDisabledChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.AutoModerationUserCommunicationDisabled;
+	}
+
+	/// <summary>
+	/// The rule's name that blocked the message and triggered the timeout.
+	/// </summary>
+	public string RuleName => this.Options!.AutoModerationRuleName;
+
+	/// <summary>
+	/// What type of filter the rule uses.
+	/// </summary>
+	public AutomodTriggerType? TriggerType => this.Options!.AutoModerationRuleTriggerType;
+
+	/// <summary>
+	/// The channel's id in which the rule triggered.
+	/// </summary>
+	public ulong? ChannelId => this.Options!.ChannelId!.Value;
+
+	/// <summary>
+	/// The channel in which the rule triggered.
+	/// </summary>
+	public DiscordChannel? Channel => this.Options!.Channel;
+
+	/// <summary>
+	/// The member that was timed out.
+	/// </summary>
+	public DiscordMember TargetMember => this.Discord.Guilds[this.GuildId].Members[this.TargetId.Value!];
+
+	/// <inheritdoc />
+	internal override string? ChangeDescription
+		=> $"Automod timed out {this.TargetMember} for reason {this.Reason ?? "No reason given".Italic()}";
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/BotAddChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/BotAddChangeSet.cs
new file mode 100644
index 0000000000..97e7919911
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/BotAddChangeSet.cs
@@ -0,0 +1,23 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for adding a bot user to the server.
+/// </summary>
+public sealed class BotAddChangeSet : DiscordAuditLogEntry
+{
+	public BotAddChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.BotAdd;
+	}
+
+	/// <summary>
+	/// Gets the bot user that was added.
+	/// </summary>
+	public DiscordUser Bot => this.Discord.GetCachedOrEmptyUserInternal(this.TargetId!.Value);
+
+	/// <inheritdoc />
+	internal override string? ChangeDescription
+		=> $"{this.User} added {this.Bot}";
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelCreateChangeSet.cs
new file mode 100644
index 0000000000..c33808b9bc
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelCreateChangeSet.cs
@@ -0,0 +1,139 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for a new channel creation.
+/// </summary>
+public sealed class ChannelCreateChangeSet : DiscordAuditLogEntry
+{
+	public ChannelCreateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.ChannelCreate;
+	}
+
+	/// <summary>
+	/// Gets the Discord channel associated with this change.
+	/// </summary>
+	public DiscordChannel Channel => this.Discord.Guilds[this.GuildId].Channels[this.TargetId!.Value];
+
+	/// <summary>
+	/// Gets the new name of the channel.
+	/// </summary>
+	public string Name => (string)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+
+	/// <summary>
+	/// Gets the type of the channel.
+	/// </summary>
+	public ChannelType Type => (ChannelType)this.Changes.FirstOrDefault(x => x.Key == "type")?.NewValue;
+
+	/// <summary>
+	/// Gets the new topic of the channel.
+	/// </summary>
+	public string? Topic => (string?)this.Changes.FirstOrDefault(x => x.Key == "topic")?.NewValue;
+
+	/// <summary>
+	/// Gets the new position of the channel.
+	/// </summary>
+	public int? Position => (int?)this.Changes.FirstOrDefault(x => x.Key == "position")?.NewValue;
+
+	/// <summary>
+	/// Gets the new permission overwrites for the channel.
+	/// </summary>
+	public DiscordOverwrite[] PermissionOverwrites => (DiscordOverwrite[])this.Changes.FirstOrDefault(x => x.Key == "permission_overwrites")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel is marked as NSFW (Not Safe For Work).
+	/// </summary>
+	public bool IsNfsw => (bool)this.Changes.FirstOrDefault(x => x.Key == "nsfw")?.NewValue;
+
+	/// <summary>
+	/// Gets the new rate limit per user for the channel.
+	/// </summary>
+	public int PerUserRateLimit => (int)this.Changes.FirstOrDefault(x => x.Key == "rate_limit_per_user")?.NewValue;
+
+	/// <summary>
+	/// Gets the new icon emoji for the channel.
+	/// </summary>
+	public DiscordEmoji? IconEmoji => (DiscordEmoji?)this.Changes.FirstOrDefault(x => x.Key == "icon_emoji")?.NewValue;
+
+	/// <summary>
+	/// Gets the new default auto-archive duration for the channel.
+	/// </summary>
+	public ThreadAutoArchiveDuration? DefaultAutoArchiveDuration => (ThreadAutoArchiveDuration?)this.Changes.FirstOrDefault(x => x.Key == "default_auto_archive_duration")?.NewValue;
+
+	/// <summary>
+	/// Gets the new flags for the channel.
+	/// </summary>
+	public ChannelFlags Flags => (ChannelFlags)this.Changes.FirstOrDefault(x => x.Key == "flags")?.NewValue;
+
+	/// <summary>
+	/// Gets the new parent ID for the channel.
+	/// </summary>
+	public ulong? ParentId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "parent_id")?.NewValue;
+
+	/// <summary>
+	/// Gets the parent channel of this channel, if it has one.
+	/// </summary>
+	public DiscordChannel? Parent => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ParentId ?? 0ul, out var channel) ? channel : null;
+
+#region Voice
+
+	/// <summary>
+	/// Gets the new bitrate for the voice channel.
+	/// </summary>
+	public int? Bitrate => (int?)this.Changes.FirstOrDefault(x => x.Key == "bitrate")?.NewValue;
+
+	/// <summary>
+	/// Gets the new user limit for the voice channel.
+	/// </summary>
+	public int? UserLimit => (int?)this.Changes.FirstOrDefault(x => x.Key == "user_limit")?.NewValue;
+
+	/// <summary>
+	/// Gets the new RTC (Real-Time Communication) region ID for the voice channel.
+	/// </summary>
+	public string? RtcRegionId => (string?)this.Changes.FirstOrDefault(x => x.Key == "rtc_region")?.NewValue;
+
+	/// <summary>
+	/// Gets the RTC region associated with the voice channel.
+	/// </summary>
+	public DiscordVoiceRegion? RtcRegion => this.Discord.VoiceRegions[this.RtcRegionId];
+
+	/// <summary>
+	/// Gets the new video quality mode for the voice channel.
+	/// </summary>
+	public VideoQualityMode? VideoQualityMode => (VideoQualityMode?)this.Changes.FirstOrDefault(x => x.Key == "video_quality_mode")?.NewValue;
+
+#endregion
+
+#region Forum
+
+	/// <summary>
+	/// Gets the new available tags for the forum channel.
+	/// </summary>
+	public ForumPostTag? AvailableTags => (ForumPostTag?)this.Changes.FirstOrDefault(x => x.Key == "available_tags")?.NewValue;
+
+	/// <summary>
+	/// Gets the new default reaction emoji for the forum channel.
+	/// </summary>
+	public ForumReactionEmoji? DefaultReactionEmoji => (ForumReactionEmoji?)this.Changes.FirstOrDefault(x => x.Key == "default_reaction_emoji")?.NewValue;
+
+	/// <summary>
+	/// Gets the new default sort order for the forum channel.
+	/// </summary>
+	public ForumPostSortOrder? DefaultSortOrder => (ForumPostSortOrder?)this.Changes.FirstOrDefault(x => x.Key == "default_sort_order")?.NewValue;
+
+	/// <summary>
+	/// Gets the new default layout for the forum channel.
+	/// </summary>
+	public ForumLayout? DefaultLayout => (ForumLayout?)this.Changes.FirstOrDefault(x => x.Key == "default_forum_layout")?.NewValue;
+
+	/// <summary>
+	/// Gets the new default thread per user rate limit for the forum channel.
+	/// </summary>
+	public int? DefaultThreadPerUserRateLimit => (int?)this.Changes.FirstOrDefault(x => x.Key == "default_thread_rate_limit_per_user")?.NewValue;
+
+#endregion
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelDeleteChangeSet.cs
new file mode 100644
index 0000000000..1c0d8a216c
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelDeleteChangeSet.cs
@@ -0,0 +1,134 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for a channel deletion.
+/// </summary>
+public sealed class ChannelDeleteChangeSet : DiscordAuditLogEntry
+{
+	public ChannelDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.ChannelDelete;
+	}
+
+	/// <summary>
+	/// Gets the old name of the deleted channel.
+	/// </summary>
+	public string Name => (string)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+
+	/// <summary>
+	/// Gets the old type of the deleted channel.
+	/// </summary>
+	public ChannelType Type => (ChannelType)this.Changes.FirstOrDefault(x => x.Key == "type")?.OldValue;
+
+	/// <summary>
+	/// Gets the old topic of the deleted channel.
+	/// </summary>
+	public string? Topic => (string?)this.Changes.FirstOrDefault(x => x.Key == "topic")?.OldValue;
+
+	/// <summary>
+	/// Gets the old position of the deleted channel.
+	/// </summary>
+	public int? Position => (int?)this.Changes.FirstOrDefault(x => x.Key == "position")?.OldValue;
+
+	/// <summary>
+	/// Gets the old permission overwrites of the deleted channel.
+	/// </summary>
+	public DiscordOverwrite[] PermissionOverwrites => (DiscordOverwrite[])this.Changes.FirstOrDefault(x => x.Key == "permission_overwrites")?.OldValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the deleted channel was marked as NSFW.
+	/// </summary>
+	public bool IsNfsw => (bool)this.Changes.FirstOrDefault(x => x.Key == "nsfw")?.OldValue;
+
+	/// <summary>
+	/// Gets the old per-user rate limit of the deleted channel.
+	/// </summary>
+	public int PerUserRateLimit => (int)this.Changes.FirstOrDefault(x => x.Key == "rate_limit_per_user")?.OldValue;
+
+	/// <summary>
+	/// Gets the old icon emoji of the deleted channel.
+	/// </summary>
+	public DiscordEmoji? IconEmoji => (DiscordEmoji?)this.Changes.FirstOrDefault(x => x.Key == "icon_emoji")?.OldValue;
+
+	/// <summary>
+	/// Gets the old default auto-archive duration of the deleted channel.
+	/// </summary>
+	public ThreadAutoArchiveDuration? DefaultAutoArchiveDuration => (ThreadAutoArchiveDuration?)this.Changes.FirstOrDefault(x => x.Key == "default_auto_archive_duration")?.OldValue;
+
+	/// <summary>
+	/// Gets the old flags of the deleted channel.
+	/// </summary>
+	public ChannelFlags Flags => (ChannelFlags)this.Changes.FirstOrDefault(x => x.Key == "flags")?.OldValue;
+
+	/// <summary>
+	/// Gets the old parent ID of the deleted channel.
+	/// </summary>
+	public ulong? ParentId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "parent_id")?.OldValue;
+
+	/// <summary>
+	/// Gets the old parent channel of the deleted channel.
+	/// </summary>
+	public DiscordChannel? Parent => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ParentId ?? 0ul, out var channel) ? channel : null;
+
+#region Voice
+
+	/// <summary>
+	/// Gets the old bitrate of the deleted voice channel.
+	/// </summary>
+	public int? Bitrate => (int?)this.Changes.FirstOrDefault(x => x.Key == "bitrate")?.OldValue;
+
+	/// <summary>
+	/// Gets the old user limit of the deleted voice channel.
+	/// </summary>
+	public int? UserLimit => (int?)this.Changes.FirstOrDefault(x => x.Key == "user_limit")?.OldValue;
+
+	/// <summary>
+	/// Gets the old RTC region ID of the deleted voice channel.
+	/// </summary>
+	public string? RtcRegionId => (string?)this.Changes.FirstOrDefault(x => x.Key == "rtc_region")?.OldValue;
+
+	/// <summary>
+	/// Gets the old RTC region of the deleted voice channel.
+	/// </summary>
+	public DiscordVoiceRegion? RtcRegion => this.Discord.VoiceRegions[this.RtcRegionId];
+
+	/// <summary>
+	/// Gets the old video quality mode of the deleted voice channel.
+	/// </summary>
+	public VideoQualityMode? VideoQualityMode => (VideoQualityMode?)this.Changes.FirstOrDefault(x => x.Key == "video_quality_mode")?.OldValue;
+
+#endregion
+
+#region Forum
+
+	/// <summary>
+	/// Gets the old available tags of the deleted forum channel.
+	/// </summary>
+	public ForumPostTag? AvailableTags => (ForumPostTag?)this.Changes.FirstOrDefault(x => x.Key == "available_tags")?.OldValue;
+
+	/// <summary>
+	/// Gets the old default reaction emoji of the deleted forum channel.
+	/// </summary>
+	public ForumReactionEmoji? DefaultReactionEmoji => (ForumReactionEmoji?)this.Changes.FirstOrDefault(x => x.Key == "default_reaction_emoji")?.OldValue;
+
+	/// <summary>
+	/// Gets the old default sort order of the deleted forum channel.
+	/// </summary>
+	public ForumPostSortOrder? DefaultSortOrder => (ForumPostSortOrder?)this.Changes.FirstOrDefault(x => x.Key == "default_sort_order")?.OldValue;
+
+	/// <summary>
+	/// Gets the old default forum layout of the deleted forum channel.
+	/// </summary>
+	public ForumLayout? DefaultLayout => (ForumLayout?)this.Changes.FirstOrDefault(x => x.Key == "default_forum_layout")?.OldValue;
+
+	/// <summary>
+	/// Gets the old default thread per-user rate limit of the deleted forum channel.
+	/// </summary>
+	public int? DefaultThreadPerUserRateLimit => (int?)this.Changes.FirstOrDefault(x => x.Key == "default_thread_rate_limit_per_user")?.OldValue;
+
+#endregion
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelOverwriteCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelOverwriteCreateChangeSet.cs
new file mode 100644
index 0000000000..faff5721e1
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelOverwriteCreateChangeSet.cs
@@ -0,0 +1,41 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for adding a permission overwrite to a channel.
+/// </summary>
+public sealed class ChannelOverwriteCreateChangeSet : DiscordAuditLogEntry
+{
+	public ChannelOverwriteCreateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.ChannelOverwriteCreate;
+	}
+
+	/// <summary>
+	/// Gets the allowed permissions after the change.
+	/// </summary>
+	public Permissions? Allowed => (Permissions?)this.Changes.FirstOrDefault(x => x.Key == "allow")?.NewValue;
+
+	/// <summary>
+	/// Gets the denied permissions after the change.
+	/// </summary>
+	public Permissions? Denied => (Permissions?)this.Changes.FirstOrDefault(x => x.Key == "deny")?.NewValue;
+
+	/// <inheritdoc />
+	internal override string ChangeDescription
+	{
+		get
+		{
+			var description = $"{this.User} executed {this.GetType().Name.Replace("ChangeSet", string.Empty)} for {this.Options!.OverwrittenEntityType} with id{this.Options.OverwrittenEntityId} {(this.Options.OverwrittenEntityType == OverwriteType.Role ? $" and name {this.Options.RoleName}" : string.Empty)} with reason {this.Reason ?? $"No reason given".Italic()}\n";
+
+			description += this.Allowed is not null ? $"- Set Allowed Permissions to {this.Allowed}\n" : "- No Allowed Permissions\n";
+
+			description += this.Denied is not null ? $"- Set Denied Permissions to {this.Denied}\n" : "- No Denied Permissions\n";
+
+			return description;
+		}
+	}
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelOverwriteDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelOverwriteDeleteChangeSet.cs
new file mode 100644
index 0000000000..c626b556c0
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelOverwriteDeleteChangeSet.cs
@@ -0,0 +1,26 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting a permission overwrite from a channel.
+/// </summary>
+public sealed class ChannelOverwriteDeleteChangeSet : DiscordAuditLogEntry
+{
+	public ChannelOverwriteDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.ChannelOverwriteDelete;
+	}
+
+	/// <summary>
+	/// Gets the allowed permissions before the change.
+	/// </summary>
+	public Permissions? Allowed => (Permissions?)this.Changes.FirstOrDefault(x => x.Key == "allow")?.OldValue;
+
+	/// <summary>
+	/// Gets the denied permissions before the change.
+	/// </summary>
+	public Permissions? Denied => (Permissions?)this.Changes.FirstOrDefault(x => x.Key == "deny")?.OldValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelOverwriteUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelOverwriteUpdateChangeSet.cs
new file mode 100644
index 0000000000..f278421ab0
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelOverwriteUpdateChangeSet.cs
@@ -0,0 +1,63 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating a permission overwrite for a channel.
+/// </summary>
+public sealed class ChannelOverwriteUpdateChangeSet : DiscordAuditLogEntry
+{
+	public ChannelOverwriteUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.ChannelOverwriteUpdate;
+	}
+
+	/// <summary>
+	/// Gets a value indicating whether the allowed permissions have changed.
+	/// </summary>
+	public bool AllowChanged => this.AllowBefore is not null || this.AllowAfter is not null;
+
+	/// <summary>
+	/// Gets the old allowed permissions before the change.
+	/// </summary>
+	public Permissions? AllowBefore => (Permissions?)this.Changes.FirstOrDefault(x => x.Key == "allow")?.OldValue;
+
+	/// <summary>
+	/// Gets the new allowed permissions after the change.
+	/// </summary>
+	public Permissions? AllowAfter => (Permissions?)this.Changes.FirstOrDefault(x => x.Key == "allow")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the denied permissions have changed.
+	/// </summary>
+	public bool DenyChanged => this.DenyBefore is not null || this.DenyAfter is not null;
+
+	/// <summary>
+	/// Gets the old denied permissions before the change.
+	/// </summary>
+	public Permissions? DenyBefore => (Permissions?)this.Changes.FirstOrDefault(x => x.Key == "deny")?.OldValue;
+
+	/// <summary>
+	/// Gets the new denied permissions after the change.
+	/// </summary>
+	public Permissions? DenyAfter => (Permissions?)this.Changes.FirstOrDefault(x => x.Key == "deny")?.NewValue;
+
+	/// <inheritdoc />
+	internal override string ChangeDescription
+	{
+		get
+		{
+			var description = $"{this.User} executed {this.GetType().Name.Replace("ChangeSet", string.Empty)} for {this.Options!.OverwrittenEntityType} with id{this.Options.OverwrittenEntityId} {(this.Options.OverwrittenEntityType == OverwriteType.Role ? $" and name {this.Options.RoleName}" : string.Empty)} with reason {this.Reason ?? $"No reason given".Italic()}\n";
+
+			if (this.AllowChanged)
+				description += this.AllowAfter is not null ? $"- Set Allowed Permissions to {this.AllowAfter}\n" : "- Unset Allowed Permissions\n";
+
+			if (this.DenyChanged)
+				description += this.DenyAfter is not null ? $"- Set Denied Permissions to {this.DenyAfter}\n" : "- Unset Denied Permissions\n";
+
+			return description;
+		}
+	}
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelUpdateChangeSet.cs
new file mode 100644
index 0000000000..c492356dfd
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ChannelUpdateChangeSet.cs
@@ -0,0 +1,334 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating channel settings.
+/// </summary>
+public sealed class ChannelUpdateChangeSet : DiscordAuditLogEntry
+{
+	public ChannelUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.ChannelUpdate;
+	}
+
+	/// <summary>
+	/// Gets the Discord channel associated with this change.
+	/// </summary>
+	public DiscordChannel Channel => this.Discord.Guilds[this.GuildId].Channels[this.TargetId!.Value];
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's name was changed.
+	/// </summary>
+	public bool NameChanged => this.NameBefore is not null || this.NameAfter is not null;
+
+	/// <summary>
+	/// Gets the previous name of the channel.
+	/// </summary>
+	public string? NameBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+
+	/// <summary>
+	/// Gets the new name of the channel.
+	/// </summary>
+	public string? NameAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's type was changed.
+	/// </summary>
+	public bool TypeChanged => this.TypeBefore is not null || this.TypeAfter is not null;
+
+	/// <summary>
+	/// Gets the previous type of the channel.
+	/// </summary>
+	public ChannelType? TypeBefore => (ChannelType?)this.Changes.FirstOrDefault(x => x.Key == "type")?.OldValue;
+
+	/// <summary>
+	/// Gets the new type of the channel.
+	/// </summary>
+	public ChannelType? TypeAfter => (ChannelType?)this.Changes.FirstOrDefault(x => x.Key == "type")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's topic was changed.
+	/// </summary>
+	public bool TopicChanged => this.TopicBefore is not null || this.TopicAfter is not null;
+
+	/// <summary>
+	/// Gets the previous topic of the channel.
+	/// </summary>
+	public string? TopicBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "topic")?.OldValue;
+
+	/// <summary>
+	/// Gets the new topic of the channel.
+	/// </summary>
+	public string? TopicAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "topic")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's position was changed.
+	/// </summary>
+	public bool PositionChanged => this.PositionBefore is not null || this.PositionAfter is not null;
+
+	/// <summary>
+	/// Gets the previous position of the channel.
+	/// </summary>
+	public int? PositionBefore => (int?)this.Changes.FirstOrDefault(x => x.Key == "position")?.OldValue;
+
+	/// <summary>
+	/// Gets the new position of the channel.
+	/// </summary>
+	public int? PositionAfter => (int?)this.Changes.FirstOrDefault(x => x.Key == "position")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's NSFW status was changed.
+	/// </summary>
+	public bool IsNfswChanged => this.IsNfswBefore is not null || this.IsNfswAfter is not null;
+
+	/// <summary>
+	/// Gets the previous NSFW status of the channel.
+	/// </summary>
+	public bool? IsNfswBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "nsfw")?.OldValue;
+
+	/// <summary>
+	/// Gets the new NSFW status of the channel.
+	/// </summary>
+	public bool? IsNfswAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "nsfw")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's rate limit per user was changed.
+	/// </summary>
+	public bool PerUserRateLimitChanged => this.PerUserRateLimitBefore is not null || this.PerUserRateLimitAfter is not null;
+
+	/// <summary>
+	/// Gets the previous rate limit per user of the channel.
+	/// </summary>
+	public int? PerUserRateLimitBefore => (int?)this.Changes.FirstOrDefault(x => x.Key == "rate_limit_per_user")?.OldValue;
+
+	/// <summary>
+	/// Gets the new rate limit per user of the channel.
+	/// </summary>
+	public int? PerUserRateLimitAfter => (int?)this.Changes.FirstOrDefault(x => x.Key == "rate_limit_per_user")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's icon emoji was changed.
+	/// </summary>
+	public bool IconEmojiChanged => this.IconEmojiBefore is not null || this.IconEmojiAfter is not null;
+
+	/// <summary>
+	/// Gets the previous icon emoji of the channel.
+	/// </summary>
+	public DiscordEmoji? IconEmojiBefore => (DiscordEmoji?)this.Changes.FirstOrDefault(x => x.Key == "icon_emoji")?.OldValue;
+
+	/// <summary>
+	/// Gets the new icon emoji of the channel.
+	/// </summary>
+	public DiscordEmoji? IconEmojiAfter => (DiscordEmoji?)this.Changes.FirstOrDefault(x => x.Key == "icon_emoji")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's default auto-archive duration was changed.
+	/// </summary>
+	public bool DefaultAutoArchiveDurationChanged => this.DefaultAutoArchiveDurationBefore is not null || this.DefaultAutoArchiveDurationAfter is not null;
+
+	/// <summary>
+	/// Gets the previous default auto-archive duration of the channel.
+	/// </summary>
+	public ThreadAutoArchiveDuration? DefaultAutoArchiveDurationBefore => (ThreadAutoArchiveDuration?)this.Changes.FirstOrDefault(x => x.Key == "default_auto_archive_duration")?.OldValue;
+
+	/// <summary>
+	/// Gets the new default auto-archive duration of the channel.
+	/// </summary>
+	public ThreadAutoArchiveDuration? DefaultAutoArchiveDurationAfter => (ThreadAutoArchiveDuration?)this.Changes.FirstOrDefault(x => x.Key == "default_auto_archive_duration")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's flags were changed.
+	/// </summary>
+	public bool FlagsChanged => this.FlagsBefore is not null || this.FlagsAfter is not null;
+
+	/// <summary>
+	/// Gets the previous flags of the channel.
+	/// </summary>
+	public ChannelFlags? FlagsBefore => (ChannelFlags?)this.Changes.FirstOrDefault(x => x.Key == "flags")?.OldValue;
+
+	/// <summary>
+	/// Gets the new flags of the channel.
+	/// </summary>
+	public ChannelFlags? FlagsAfter => (ChannelFlags?)this.Changes.FirstOrDefault(x => x.Key == "flags")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's parent ID was changed.
+	/// </summary>
+	public bool ParentIdChanged => this.ParentIdBefore is not null || this.ParentIdAfter is not null;
+
+	/// <summary>
+	/// Gets the previous parent ID of the channel.
+	/// </summary>
+	public ulong? ParentIdBefore => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "parent_id")?.OldValue;
+
+	/// <summary>
+	/// Gets the new parent ID of the channel.
+	/// </summary>
+	public ulong? ParentIdAfter => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "parent_id")?.NewValue;
+
+	/// <summary>
+	/// Gets the previous parent channel of the channel.
+	/// </summary>
+	public DiscordChannel? ParentBefore => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ParentIdBefore ?? 0ul, out var channel) ? channel : null;
+
+	/// <summary>
+	/// Gets the new parent channel of the channel.
+	/// </summary>
+	public DiscordChannel? ParentAfter => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ParentIdAfter ?? 0ul, out var channel) ? channel : null;
+
+#region Voice
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's bitrate was changed.
+	/// </summary>
+	public bool BitrateChanged => this.BitrateBefore is not null || this.BitrateAfter is not null;
+
+	/// <summary>
+	/// Gets the previous bitrate of the channel.
+	/// </summary>
+	public int? BitrateBefore => (int?)this.Changes.FirstOrDefault(x => x.Key == "bitrate")?.OldValue;
+
+	/// <summary>
+	/// Gets the new bitrate of the channel.
+	/// </summary>
+	public int? BitrateAfter => (int?)this.Changes.FirstOrDefault(x => x.Key == "bitrate")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's user limit was changed.
+	/// </summary>
+	public bool UserLimitChanged => this.UserLimitBefore is not null || this.UserLimitAfter is not null;
+
+	/// <summary>
+	/// Gets the previous user limit of the channel.
+	/// </summary>
+	public int? UserLimitBefore => (int?)this.Changes.FirstOrDefault(x => x.Key == "user_limit")?.OldValue;
+
+	/// <summary>
+	/// Gets the new user limit of the channel.
+	/// </summary>
+	public int? UserLimitAfter => (int?)this.Changes.FirstOrDefault(x => x.Key == "user_limit")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's RTC region ID was changed.
+	/// </summary>
+	public bool RtcRegionIdChanged => this.RtcRegionIdBefore is not null || this.RtcRegionIdAfter is not null;
+
+	/// <summary>
+	/// Gets the previous RTC region ID of the channel.
+	/// </summary>
+	public string? RtcRegionIdBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "rtc_region")?.OldValue;
+
+	/// <summary>
+	/// Gets the new RTC region ID of the channel.
+	/// </summary>
+	public string? RtcRegionIdAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "rtc_region")?.NewValue;
+
+	/// <summary>
+	/// Gets the previous RTC region of the channel.
+	/// </summary>
+	public DiscordVoiceRegion? RtcRegionBefore => this.Discord.VoiceRegions[this.RtcRegionIdBefore];
+
+	/// <summary>
+	/// Gets the new RTC region of the channel.
+	/// </summary>
+	public DiscordVoiceRegion? RtcRegionAfter => this.Discord.VoiceRegions[this.RtcRegionIdAfter];
+
+	/// <summary>
+	/// Gets a value indicating whether the channel's video quality mode was changed.
+	/// </summary>
+	public bool VideoQualityModeChanged => this.VideoQualityModeBefore is not null || this.VideoQualityModeAfter is not null;
+
+	/// <summary>
+	/// Gets the previous video quality mode of the channel.
+	/// </summary>
+	public VideoQualityMode? VideoQualityModeBefore => (VideoQualityMode?)this.Changes.FirstOrDefault(x => x.Key == "video_quality_mode")?.OldValue;
+
+	/// <summary>
+	/// Gets the new video quality mode of the channel.
+	/// </summary>
+	public VideoQualityMode? VideoQualityModeAfter => (VideoQualityMode?)this.Changes.FirstOrDefault(x => x.Key == "video_quality_mode")?.NewValue;
+
+#endregion
+
+#region Forum
+
+	/// <summary>
+	/// Gets a value indicating whether the available tags for forum posts were changed.
+	/// </summary>
+	public bool AvailableTagsChanged => this.AvailableTagsBefore is not null || this.AvailableTagsAfter is not null;
+
+	/// <summary>
+	/// Gets the previous available tags for forum posts.
+	/// </summary>
+	public ForumPostTag? AvailableTagsBefore => (ForumPostTag?)this.Changes.FirstOrDefault(x => x.Key == "available_tags")?.OldValue;
+
+	/// <summary>
+	/// Gets the new available tags for forum posts.
+	/// </summary>
+	public ForumPostTag? AvailableTagsAfter => (ForumPostTag?)this.Changes.FirstOrDefault(x => x.Key == "available_tags")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the default reaction emoji for forum posts was changed.
+	/// </summary>
+	public bool DefaultReactionEmojiChanged => this.DefaultReactionEmojiBefore is not null || this.DefaultReactionEmojiAfter is not null;
+
+	/// <summary>
+	/// Gets the previous default reaction emoji for forum posts.
+	/// </summary>
+	public ForumReactionEmoji? DefaultReactionEmojiBefore => (ForumReactionEmoji?)this.Changes.FirstOrDefault(x => x.Key == "default_reaction_emoji")?.OldValue;
+
+	/// <summary>
+	/// Gets the new default reaction emoji for forum posts.
+	/// </summary>
+	public ForumReactionEmoji? DefaultReactionEmojiAfter => (ForumReactionEmoji?)this.Changes.FirstOrDefault(x => x.Key == "default_reaction_emoji")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the default sort order for forum posts was changed.
+	/// </summary>
+	public bool DefaultSortOrderChanged => this.DefaultSortOrderBefore is not null || this.DefaultSortOrderAfter is not null;
+
+	/// <summary>
+	/// Gets the previous default sort order for forum posts.
+	/// </summary>
+	public ForumPostSortOrder? DefaultSortOrderBefore => (ForumPostSortOrder?)this.Changes.FirstOrDefault(x => x.Key == "default_sort_order")?.OldValue;
+
+	/// <summary>
+	/// Gets the new default sort order for forum posts.
+	/// </summary>
+	public ForumPostSortOrder? DefaultSortOrderAfter => (ForumPostSortOrder?)this.Changes.FirstOrDefault(x => x.Key == "default_sort_order")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the default layout for forum posts was changed.
+	/// </summary>
+	public bool DefaultLayoutChanged => this.DefaultLayoutBefore is not null || this.DefaultLayoutAfter is not null;
+
+	/// <summary>
+	/// Gets the previous default layout for forum posts.
+	/// </summary>
+	public ForumLayout? DefaultLayoutBefore => (ForumLayout?)this.Changes.FirstOrDefault(x => x.Key == "default_forum_layout")?.OldValue;
+
+	/// <summary>
+	/// Gets the new default layout for forum posts.
+	/// </summary>
+	public ForumLayout? DefaultLayoutAfter => (ForumLayout?)this.Changes.FirstOrDefault(x => x.Key == "default_forum_layout")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the default thread rate limit per user for forum posts was changed.
+	/// </summary>
+	public bool DefaultThreadPerUserRateLimitChanged => this.DefaultThreadPerUserRateLimitBefore is not null || this.DefaultThreadPerUserRateLimitAfter is not null;
+
+	/// <summary>
+	/// Gets the previous default thread rate limit per user for forum posts.
+	/// </summary>
+	public int? DefaultThreadPerUserRateLimitBefore => (int?)this.Changes.FirstOrDefault(x => x.Key == "default_thread_rate_limit_per_user")?.OldValue;
+
+	/// <summary>
+	/// Gets the new default thread rate limit per user for forum posts.
+	/// </summary>
+	public int? DefaultThreadPerUserRateLimitAfter => (int?)this.Changes.FirstOrDefault(x => x.Key == "default_thread_rate_limit_per_user")?.NewValue;
+
+#endregion
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ClydeUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ClydeUpdateChangeSet.cs
new file mode 100644
index 0000000000..04d70c2018
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/ClydeUpdateChangeSet.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating clyde in the server.
+/// </summary>
+public sealed class ClydeUpdateChangeSet : DiscordAuditLogEntry
+{
+	public ClydeUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.ClydeAIProfileUpdate;
+	}
+
+	public bool NameChanged => this.NameBefore is not null || this.NameAfter is not null;
+	public string? NameBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public string? NameAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+
+	public bool AvatarHashChanged => this.AvatarHashBefore is not null || this.AvatarHashAfter is not null;
+	public string? AvatarHashBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "avatar_hash")?.OldValue;
+	public string? AvatarHashAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "avatar_hash")?.NewValue;
+
+	public bool BannerHashChanged => this.BannerHashBefore is not null || this.BannerHashAfter is not null;
+	public string? BannerHashBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "banner_hash")?.OldValue;
+	public string? BannerHashAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "banner_hash")?.NewValue;
+
+	public bool BioChanged => this.BioBefore is not null || this.BioAfter is not null;
+	public string? BioBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "bio")?.OldValue;
+	public string? BioAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "bio")?.NewValue;
+
+	public bool PersonalityChanged => this.PersonalityBefore is not null || this.PersonalityAfter is not null;
+	public string? PersonalityBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "personality")?.OldValue;
+	public string? PersonalityAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "personality")?.NewValue;
+
+	public bool ClydeProfileIdChanged => this.ClydeProfileIdBefore is not null || this.ClydeProfileIdAfter is not null;
+	public ulong? ClydeProfileIdBefore => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "clyde_profile_id")?.OldValue;
+	public ulong? ClydeProfileIdAfter => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "clyde_profile_id")?.NewValue;
+
+	public bool ThemeColorsChanged => this.ThemeColorIntsBefore is not null || this.ThemeColorIntsAfter is not null;
+	public List<int>? ThemeColorIntsBefore => (List<int>?)this.Changes.FirstOrDefault(x => x.Key == "theme_colors")?.OldValue;
+	public IReadOnlyList<DiscordColor>? ThemeColoreBefore => !(this.ThemeColorIntsBefore is not null && this.ThemeColorIntsBefore.Count != 0) ? null : this.ThemeColorIntsBefore.Select(x => new DiscordColor(x)).ToList();
+	public List<int>? ThemeColorIntsAfter => (List<int>?)this.Changes.FirstOrDefault(x => x.Key == "theme_colors")?.NewValue;
+	public IReadOnlyList<DiscordColor>? ThemeColorsAfter => !(this.ThemeColorIntsAfter is not null && this.ThemeColorIntsAfter.Count != 0) ? null : this.ThemeColorIntsAfter.Select(x => new DiscordColor(x)).ToList();
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/CreatorMonetizationRequestCreatedChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/CreatorMonetizationRequestCreatedChangeSet.cs
new file mode 100644
index 0000000000..93376a3872
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/CreatorMonetizationRequestCreatedChangeSet.cs
@@ -0,0 +1,18 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for the creation of a creator monetization request.
+/// </summary>
+public sealed class CreatorMonetizationRequestCreatedChangeSet : DiscordAuditLogEntry
+{
+	public CreatorMonetizationRequestCreatedChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.CreatorMonetizationRequestCreated;
+	}
+
+	/// <inheritdoc />
+	internal override string? ChangeDescription
+		=> $"{this.User} created Creator Monetization Request";
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/CreatorMonetizationTermsAcceptedChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/CreatorMonetizationTermsAcceptedChangeSet.cs
new file mode 100644
index 0000000000..da1ca4b5a1
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/CreatorMonetizationTermsAcceptedChangeSet.cs
@@ -0,0 +1,18 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for the acceptance of creator monetization terms.
+/// </summary>
+public sealed class CreatorMonetizationTermsAcceptedChangeSet : DiscordAuditLogEntry
+{
+	public CreatorMonetizationTermsAcceptedChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.CreatorMonetizationTermsAccepted;
+	}
+
+	/// <inheritdoc />
+	internal override string? ChangeDescription
+		=> $"{this.User} accepted Creator Monetization Terms";
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/EmojiCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/EmojiCreateChangeSet.cs
new file mode 100644
index 0000000000..61242a433b
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/EmojiCreateChangeSet.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for creating an emoji.
+/// </summary>
+public sealed class EmojiCreateChangeSet : DiscordAuditLogEntry
+{
+	public EmojiCreateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.EmojiCreate;
+	}
+
+	public string? EmojiName => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+	public IReadOnlyList<ulong>? RolesAllowed => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "roles")?.NewValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public bool EmojiNameChanged => this.EmojiName is not null;
+	public bool RolesAllowedChanged => this.RolesAllowed is not null;
+
+	/// <inheritdoc />
+	internal override string ChangeDescription
+	{
+		get
+		{
+			var description = $"{this.User} created a new emoji with the following details:\n";
+			if (this.EmojiNameChanged)
+				description += $"- Emoji Name: {this.EmojiName}\n";
+			if (this.RolesAllowedChanged)
+				description += this.RolesAllowed != null && this.RolesAllowed.Any()
+					? $"- Roles Allowed: {string.Join(", ", this.RolesAllowed.Select(this.Discord.Guilds[this.GuildId].GetRole))}\n"
+					: "- Allowed everyone to use the emoji";
+			return description;
+		}
+	}
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/EmojiDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/EmojiDeleteChangeSet.cs
new file mode 100644
index 0000000000..81f3ebaea0
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/EmojiDeleteChangeSet.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting an emoji.
+/// </summary>
+public sealed class EmojiDeleteChangeSet : DiscordAuditLogEntry
+{
+	public EmojiDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.EmojiDelete;
+	}
+
+	public string? EmojiName => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public IReadOnlyList<ulong>? RolesAllowed => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "roles")?.OldValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public bool EmojiNameChanged => this.EmojiName is not null;
+	public bool RolesAllowedChanged => this.RolesAllowed is not null;
+
+	/// <inheritdoc />
+	internal override string ChangeDescription
+	{
+		get
+		{
+			var description = $"{this.User} deleted emoji {this.TargetId}:\n";
+			if (this.EmojiNameChanged)
+				description += $"- Name: {this.EmojiName}\n";
+			if (this.RolesAllowedChanged)
+				description += this.RolesAllowed != null && this.RolesAllowed.Any()
+					? $"- Roles Allowed: {string.Join(", ", this.RolesAllowed.Select(this.Discord.Guilds[this.GuildId].GetRole))}\n"
+					: "- Allowed everyone to use the emoji";
+			return description;
+		}
+	}
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/EmojiUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/EmojiUpdateChangeSet.cs
new file mode 100644
index 0000000000..338c01c75e
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/EmojiUpdateChangeSet.cs
@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating the name of an emoji.
+/// </summary>
+public sealed class EmojiUpdateChangeSet : DiscordAuditLogEntry
+{
+	public EmojiUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.EmojiUpdate;
+	}
+
+	public string? EmojiNameBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public string? EmojiNameAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+	public IReadOnlyList<ulong>? RolesAllowedBefore => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "roles")?.OldValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public IReadOnlyList<ulong>? RolesAllowedAfter => ((IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "roles")?.NewValue)?.Select(x => ConvertToUlong(x)!.Value).ToList();
+	public bool EmojiNameChanged => this.EmojiNameBefore is not null || this.EmojiNameAfter is not null;
+	public bool RolesAllowedChanged => this.RolesAllowedBefore is not null || this.RolesAllowedAfter is not null;
+
+	/// <inheritdoc />
+	internal override string ChangeDescription
+	{
+		get
+		{
+			var description = $"{this.User} updated emoji {this.TargetId}:\n";
+			if (this.EmojiNameChanged)
+			{
+				description += this.EmojiNameBefore is not null ? $"- Emoji Name Before: {this.EmojiNameBefore}\n" : "- Emoji Name Before: Not set\n";
+				description += this.EmojiNameAfter is not null ? $"- Emoji Name After: {this.EmojiNameAfter}\n" : "- Emoji Name After: Not set\n";
+			}
+
+			if (this.RolesAllowedChanged)
+			{
+				description += this.RolesAllowedBefore is not null ? $"- Roles Allowed Before: {string.Join(", ", this.RolesAllowedBefore.Select(this.Discord.Guilds[this.GuildId].GetRole))}\n" : "- Roles Allowed Before: Not set\n";
+				description += this.RolesAllowedAfter is not null ? $"- Roles Allowed After: {string.Join(", ", this.RolesAllowedAfter.Select(this.Discord.Guilds[this.GuildId].GetRole))}\n" : "- Roles Allowed After: Not set\n";
+			}
+
+			return description;
+		}
+	}
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/GuildUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/GuildUpdateChangeSet.cs
new file mode 100644
index 0000000000..67cd61c020
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/GuildUpdateChangeSet.cs
@@ -0,0 +1,278 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for a server settings update.
+/// </summary>
+public sealed class GuildUpdateChangeSet : DiscordAuditLogEntry
+{
+	public GuildUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.GuildUpdate;
+	}
+
+	public bool NameChanged => this.NameBefore is not null || this.NameAfter is not null;
+	public string? NameBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public string? NameAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+
+	public bool IconChanged => this.IconBefore is not null || this.IconAfter is not null;
+	public string? IconBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "icon")?.OldValue;
+	public string? IconAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "icon")?.NewValue;
+
+	public bool SplashChanged => this.SplashBefore is not null || this.SplashAfter is not null;
+	public string? SplashBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "splash")?.OldValue;
+	public string? SplashAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "splash")?.NewValue;
+
+	public bool DiscoverySplashChanged => this.DiscoverySplashBefore is not null || this.DiscoverySplashAfter is not null;
+	public string? DiscoverySplashBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "discovery_splash")?.OldValue;
+	public string? DiscoverySplashAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "discovery_splash")?.NewValue;
+
+	public bool OwnerIdChanged => this.OwnerIdBefore is not null || this.OwnerIdAfter is not null;
+	public ulong? OwnerIdBefore => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "owner_id")?.OldValue);
+	public ulong? OwnerIdAfter => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "owner_id")?.NewValue);
+
+	public bool AfkChannelIdChanged => this.AfkChannelIdBefore is not null || this.AfkChannelIdAfter is not null;
+	public ulong? AfkChannelIdBefore => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "afk_channel_id")?.OldValue);
+	public ulong? AfkChannelIdAfter => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "afk_channel_id")?.NewValue);
+
+	public bool AfkTimeoutChanged => this.AfkTimeoutBefore is not null || this.AfkTimeoutAfter is not null;
+	public int? AfkTimeoutBefore => (int?)this.Changes.FirstOrDefault(x => x.Key == "afk_timeout")?.OldValue;
+	public int? AfkTimeoutAfter => (int?)this.Changes.FirstOrDefault(x => x.Key == "afk_timeout")?.NewValue;
+
+	public bool WidgetEnabledChanged => this.WidgetEnabledBefore is not null || this.WidgetEnabledAfter is not null;
+	public bool? WidgetEnabledBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "widget_enabled")?.OldValue;
+	public bool? WidgetEnabledAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "widget_enabled")?.NewValue;
+
+	public bool WidgetChannelIdChanged => this.WidgetChannelIdBefore is not null || this.WidgetChannelIdAfter is not null;
+	public ulong? WidgetChannelIdBefore => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "widget_channel_id")?.OldValue);
+	public ulong? WidgetChannelIdAfter => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "widget_channel_id")?.NewValue);
+
+	public bool VerificationLevelChanged => this.VerificationLevelBefore is not null || this.VerificationLevelAfter is not null;
+	public VerificationLevel? VerificationLevelBefore => (VerificationLevel?)this.Changes.FirstOrDefault(x => x.Key == "verification_level")?.OldValue;
+	public VerificationLevel? VerificationLevelAfter => (VerificationLevel?)this.Changes.FirstOrDefault(x => x.Key == "verification_level")?.NewValue;
+
+	public bool DefaultMessageNotificationsChanged => this.DefaultMessageNotificationsBefore is not null || this.DefaultMessageNotificationsAfter is not null;
+	public DefaultMessageNotifications? DefaultMessageNotificationsBefore => (DefaultMessageNotifications?)this.Changes.FirstOrDefault(x => x.Key == "default_message_notifications")?.OldValue;
+	public DefaultMessageNotifications? DefaultMessageNotificationsAfter => (DefaultMessageNotifications?)this.Changes.FirstOrDefault(x => x.Key == "default_message_notifications")?.NewValue;
+
+	public bool ExplicitContentFilterChanged => this.ExplicitContentFilterBefore is not null || this.ExplicitContentFilterAfter is not null;
+	public ExplicitContentFilter? ExplicitContentFilterBefore => (ExplicitContentFilter?)this.Changes.FirstOrDefault(x => x.Key == "explicit_content_filter")?.OldValue;
+	public ExplicitContentFilter? ExplicitContentFilterAfter => (ExplicitContentFilter?)this.Changes.FirstOrDefault(x => x.Key == "explicit_content_filter")?.NewValue;
+
+	public bool FeaturesChanged => this.FeaturesBefore is not null || this.FeaturesAfter is not null;
+	public IReadOnlyList<string>? FeaturesBefore => (IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "features")?.OldValue;
+	public IReadOnlyList<string>? FeaturesAfter => (IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "features")?.NewValue;
+
+	public bool MfaLevelChanged => this.MfaLevelBefore is not null || this.MfaLevelAfter is not null;
+	public MfaLevel? MfaLevelBefore => (MfaLevel?)this.Changes.FirstOrDefault(x => x.Key == "mfa_level")?.OldValue;
+	public MfaLevel? MfaLevelAfter => (MfaLevel?)this.Changes.FirstOrDefault(x => x.Key == "mfa_level")?.NewValue;
+
+	public bool SystemChannelIdChanged => this.SystemChannelIdBefore is not null || this.SystemChannelIdAfter is not null;
+	public ulong? SystemChannelIdBefore => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "system_channel_id")?.OldValue);
+	public ulong? SystemChannelIdAfter => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "system_channel_id")?.NewValue);
+
+	public bool SystemChannelFlagsChanged => this.SystemChannelFlagsBefore is not null || this.SystemChannelFlagsAfter is not null;
+	public SystemChannelFlags? SystemChannelFlagsBefore => (SystemChannelFlags?)this.Changes.FirstOrDefault(x => x.Key == "system_channel_flags")?.OldValue;
+	public SystemChannelFlags? SystemChannelFlagsAfter => (SystemChannelFlags?)this.Changes.FirstOrDefault(x => x.Key == "system_channel_flags")?.NewValue;
+
+	public bool RulesChannelIdChanged => this.RulesChannelIdBefore is not null || this.RulesChannelIdAfter is not null;
+	public ulong? RulesChannelIdBefore => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "rules_channel_id")?.OldValue);
+	public ulong? RulesChannelIdAfter => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "rules_channel_id")?.NewValue);
+
+	public bool VanityUrlCodeChanged => this.VanityUrlCodeBefore is not null || this.VanityUrlCodeAfter is not null;
+	public string? VanityUrlCodeBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "vanity_url_code")?.OldValue;
+	public string? VanityUrlCodeAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "vanity_url_code")?.NewValue;
+
+	public bool DescriptionChanged => this.DescriptionBefore is not null || this.DescriptionAfter is not null;
+	public string? DescriptionBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "description")?.OldValue;
+	public string? DescriptionAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "description")?.NewValue;
+
+	public bool BannerChanged => this.BannerBefore is not null || this.BannerAfter is not null;
+	public string? BannerBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "banner")?.OldValue;
+	public string? BannerAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "banner")?.NewValue;
+
+	public bool PreferredLocaleChanged => this.PreferredLocaleBefore is not null || this.PreferredLocaleAfter is not null;
+	public string? PreferredLocaleBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "preferred_locale")?.OldValue;
+	public string? PreferredLocaleAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "preferred_locale")?.NewValue;
+
+	public bool PublicUpdatesChannelIdChanged => this.PublicUpdatesChannelIdBefore is not null || this.PublicUpdatesChannelIdAfter is not null;
+	public ulong? PublicUpdatesChannelIdBefore => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "public_updates_channel_id")?.OldValue);
+	public ulong? PublicUpdatesChannelIdAfter => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "public_updates_channel_id")?.NewValue);
+
+	public bool NsfwLevelChanged => this.NsfwLevelBefore is not null || this.NsfwLevelAfter is not null;
+	public NsfwLevel? NsfwLevelBefore => (NsfwLevel?)this.Changes.FirstOrDefault(x => x.Key == "nsfw_level")?.OldValue;
+	public NsfwLevel? NsfwLevelAfter => (NsfwLevel?)this.Changes.FirstOrDefault(x => x.Key == "nsfw_level")?.NewValue;
+
+	public bool PremiumProgressBarEnabledChanged => this.PremiumProgressBarEnabledBefore is not null || this.PremiumProgressBarEnabledAfter is not null;
+	public bool? PremiumProgressBarEnabledBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "premium_progress_bar_enabled")?.OldValue;
+	public bool? PremiumProgressBarEnabledAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "premium_progress_bar_enabled")?.NewValue;
+
+	public bool SafetyAlertsChannelIdChanged => this.SafetyAlertsChannelIdBefore is not null || this.SafetyAlertsChannelIdAfter is not null;
+	public ulong? SafetyAlertsChannelIdBefore => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "safety_alerts_channel_id")?.OldValue);
+	public ulong? SafetyAlertsChannelIdAfter => ConvertToUlong(this.Changes.FirstOrDefault(x => x.Key == "safety_alerts_channel_id")?.NewValue);
+
+	/// <inheritdoc />
+	internal override string ChangeDescription
+	{
+		get
+		{
+			var description = $"{this.User} executed {this.GetType().Name.Replace("ChangeSet", string.Empty)} with reason {this.Reason ?? "No reason given".Italic()}\n";
+
+			if (this.NameChanged)
+			{
+				description += $"Old Name: {this.NameBefore ?? "Not set"}\n";
+				description += $"New Name: {this.NameAfter ?? "Not set"}\n";
+			}
+
+			if (this.IconChanged)
+			{
+				description += $"Old Icon: {this.IconBefore ?? "Not set"}\n";
+				description += $"New Icon: {this.IconAfter ?? "Not set"}\n";
+			}
+
+			if (this.SplashChanged)
+			{
+				description += $"Old Splash: {this.SplashBefore ?? "Not set"}\n";
+				description += $"New Splash: {this.SplashAfter ?? "Not set"}\n";
+			}
+
+			if (this.DiscoverySplashChanged)
+			{
+				description += $"Old Discovery Splash: {this.DiscoverySplashBefore ?? "Not set"}\n";
+				description += $"New Discovery Splash: {this.DiscoverySplashAfter ?? "Not set"}\n";
+			}
+
+			if (this.OwnerIdChanged)
+			{
+				description += $"Old Owner ID: {this.OwnerIdBefore?.ToString() ?? "Not set"}\n";
+				description += $"New Owner ID: {this.OwnerIdAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.AfkChannelIdChanged)
+			{
+				description += $"Old AFK Channel ID: {this.AfkChannelIdBefore?.ToString() ?? "Not set"}\n";
+				description += $"New AFK Channel ID: {this.AfkChannelIdAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.AfkTimeoutChanged)
+			{
+				description += $"Old AFK Timeout: {this.AfkTimeoutBefore?.ToString() ?? "Not set"} seconds\n";
+				description += $"New AFK Timeout: {this.AfkTimeoutAfter?.ToString() ?? "Not set"} seconds\n";
+			}
+
+			if (this.WidgetEnabledChanged)
+			{
+				description += $"Old Widget Enabled: {this.WidgetEnabledBefore?.ToString() ?? "Not set"}\n";
+				description += $"New Widget Enabled: {this.WidgetEnabledAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.WidgetChannelIdChanged)
+			{
+				description += $"Old Widget Channel ID: {this.WidgetChannelIdBefore?.ToString() ?? "Not set"}\n";
+				description += $"New Widget Channel ID: {this.WidgetChannelIdAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.VerificationLevelChanged)
+			{
+				description += $"Old Verification Level: {this.VerificationLevelBefore?.ToString() ?? "Not set"}\n";
+				description += $"New Verification Level: {this.VerificationLevelAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.DefaultMessageNotificationsChanged)
+			{
+				description += $"Old Default Message Notifications: {this.DefaultMessageNotificationsBefore?.ToString() ?? "Not set"}\n";
+				description += $"New Default Message Notifications: {this.DefaultMessageNotificationsAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.ExplicitContentFilterChanged)
+			{
+				description += $"Old Explicit Content Filter: {this.ExplicitContentFilterBefore?.ToString() ?? "Not set"}\n";
+				description += $"New Explicit Content Filter: {this.ExplicitContentFilterAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.FeaturesChanged)
+			{
+				description += $"Old Features: {string.Join(", ", this.FeaturesBefore ?? new List<string>())}\n";
+				description += $"New Features: {string.Join(", ", this.FeaturesAfter ?? new List<string>())}\n";
+			}
+
+			if (this.MfaLevelChanged)
+			{
+				description += $"Old MFA Level: {this.MfaLevelBefore?.ToString() ?? "Not set"}\n";
+				description += $"New MFA Level: {this.MfaLevelAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.SystemChannelIdChanged)
+			{
+				description += $"Old System Channel ID: {this.SystemChannelIdBefore?.ToString() ?? "Not set"}\n";
+				description += $"New System Channel ID: {this.SystemChannelIdAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.SystemChannelFlagsChanged)
+			{
+				description += $"Old System Channel Flags: {this.SystemChannelFlagsBefore?.ToString() ?? "Not set"}\n";
+				description += $"New System Channel Flags: {this.SystemChannelFlagsAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.RulesChannelIdChanged)
+			{
+				description += $"Old Rules Channel ID: {this.RulesChannelIdBefore?.ToString() ?? "Not set"}\n";
+				description += $"New Rules Channel ID: {this.RulesChannelIdAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.VanityUrlCodeChanged)
+			{
+				description += $"Old Vanity URL Code: {this.VanityUrlCodeBefore ?? "Not set"}\n";
+				description += $"New Vanity URL Code: {this.VanityUrlCodeAfter ?? "Not set"}\n";
+			}
+
+			if (this.DescriptionChanged)
+			{
+				description += $"Old Description: {this.DescriptionBefore ?? "Not set"}\n";
+				description += $"New Description: {this.DescriptionAfter ?? "Not set"}\n";
+			}
+
+			if (this.BannerChanged)
+			{
+				description += $"Old Banner: {this.BannerBefore ?? "Not set"}\n";
+				description += $"New Banner: {this.BannerAfter ?? "Not set"}\n";
+			}
+
+			if (this.PreferredLocaleChanged)
+			{
+				description += $"Old Preferred Locale: {this.PreferredLocaleBefore ?? "Not set"}\n";
+				description += $"New Preferred Locale: {this.PreferredLocaleAfter ?? "Not set"}\n";
+			}
+
+			if (this.PublicUpdatesChannelIdChanged)
+			{
+				description += $"Old Public Updates Channel ID: {this.PublicUpdatesChannelIdBefore?.ToString() ?? "Not set"}\n";
+				description += $"New Public Updates Channel ID: {this.PublicUpdatesChannelIdAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.NsfwLevelChanged)
+			{
+				description += $"Old NSFW Level: {this.NsfwLevelBefore?.ToString() ?? "Not set"}\n";
+				description += $"New NSFW Level: {this.NsfwLevelAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.PremiumProgressBarEnabledChanged)
+			{
+				description += $"Old Premium Progress Bar Enabled: {this.PremiumProgressBarEnabledBefore?.ToString() ?? "Not set"}\n";
+				description += $"New Premium Progress Bar Enabled: {this.PremiumProgressBarEnabledAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			if (this.SafetyAlertsChannelIdChanged)
+			{
+				description += $"Old Safety Alerts Channel ID: {this.SafetyAlertsChannelIdBefore?.ToString() ?? "Not set"}\n";
+				description += $"New Safety Alerts Channel ID: {this.SafetyAlertsChannelIdAfter?.ToString() ?? "Not set"}\n";
+			}
+
+			return description;
+		}
+	}
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/IntegrationCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/IntegrationCreateChangeSet.cs
new file mode 100644
index 0000000000..b41df37b27
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/IntegrationCreateChangeSet.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for adding an app to the server.
+/// </summary>
+public sealed class IntegrationCreateChangeSet : DiscordAuditLogEntry
+{
+	public IntegrationCreateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.IntegrationCreate;
+	}
+
+	public string Name => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+	public string Type => (string?)this.Changes.FirstOrDefault(x => x.Key == "type")?.NewValue;
+	public bool? Enabled => (bool?)this.Changes.FirstOrDefault(x => x.Key == "enabled")?.NewValue;
+	public bool? Syncing => (bool?)this.Changes.FirstOrDefault(x => x.Key == "syncing")?.NewValue;
+
+	public ulong? RoleId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "role_id")?.NewValue;
+	public DiscordRole? Role => this.Discord.Guilds[this.GuildId].Roles.TryGetValue(this.RoleId ?? 0ul, out var role) ? role : null;
+
+	public bool? EnableEmoticons => (bool?)this.Changes.FirstOrDefault(x => x.Key == "enable_emoticons")?.NewValue;
+	public IntegrationExpireBehavior? ExpireBehavior => (IntegrationExpireBehavior?)this.Changes.FirstOrDefault(x => x.Key == "expire_behavior")?.NewValue;
+	public int? ExpireGracePeriod => (int?)this.Changes.FirstOrDefault(x => x.Key == "expire_grace_period")?.NewValue;
+	public DiscordUser? Bot => (DiscordUser?)this.Changes.FirstOrDefault(x => x.Key == "user")?.NewValue;
+	public DiscordIntegrationAccount? Account => (DiscordIntegrationAccount?)this.Changes.FirstOrDefault(x => x.Key == "account")?.NewValue;
+	public DiscordApplication? Application => (DiscordApplication?)this.Changes.FirstOrDefault(x => x.Key == "application")?.NewValue;
+	public bool? Revoked => (bool?)this.Changes.FirstOrDefault(x => x.Key == "revoked")?.NewValue;
+	public IReadOnlyList<string>? Scopes => (IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "scopes")?.NewValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/IntegrationDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/IntegrationDeleteChangeSet.cs
new file mode 100644
index 0000000000..45d7870378
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/IntegrationDeleteChangeSet.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for removing an app from the server.
+/// </summary>
+public sealed class IntegrationDeleteChangeSet : DiscordAuditLogEntry
+{
+	public IntegrationDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.IntegrationDelete;
+	}
+
+	public string Name => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public string Type => (string?)this.Changes.FirstOrDefault(x => x.Key == "type")?.OldValue;
+	public bool? Enabled => (bool?)this.Changes.FirstOrDefault(x => x.Key == "enabled")?.OldValue;
+	public bool? Syncing => (bool?)this.Changes.FirstOrDefault(x => x.Key == "syncing")?.OldValue;
+
+	public ulong? RoleId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "role_id")?.OldValue;
+	public DiscordRole? Role => this.Discord.Guilds[this.GuildId].Roles.TryGetValue(this.RoleId ?? 0ul, out var role) ? role : null;
+
+	public bool? EnableEmoticons => (bool?)this.Changes.FirstOrDefault(x => x.Key == "enable_emoticons")?.OldValue;
+	public IntegrationExpireBehavior? ExpireBehavior => (IntegrationExpireBehavior?)this.Changes.FirstOrDefault(x => x.Key == "expire_behavior")?.OldValue;
+	public int? ExpireGracePeriod => (int?)this.Changes.FirstOrDefault(x => x.Key == "expire_grace_period")?.OldValue;
+	public DiscordUser? Bot => (DiscordUser?)this.Changes.FirstOrDefault(x => x.Key == "user")?.OldValue;
+	public DiscordIntegrationAccount? Account => (DiscordIntegrationAccount?)this.Changes.FirstOrDefault(x => x.Key == "account")?.OldValue;
+	public DiscordApplication? Application => (DiscordApplication?)this.Changes.FirstOrDefault(x => x.Key == "application")?.OldValue;
+	public bool? Revoked => (bool?)this.Changes.FirstOrDefault(x => x.Key == "revoked")?.OldValue;
+	public IReadOnlyList<string>? Scopes => (IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "scopes")?.OldValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/IntegrationUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/IntegrationUpdateChangeSet.cs
new file mode 100644
index 0000000000..b3c4855d83
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/IntegrationUpdateChangeSet.cs
@@ -0,0 +1,59 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating an app, such as its scopes.
+/// </summary>
+public sealed class IntegrationUpdateChangeSet : DiscordAuditLogEntry
+{
+	public IntegrationUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.IntegrationUpdate;
+	}
+
+	public bool NameChanged => this.NameBefore is not null || this.NameAfter is not null;
+	public string? NameBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public string? NameAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+
+	public bool EnabledChanged => this.EnabledBefore is not null || this.EnabledAfter is not null;
+	public bool? EnabledBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "enabled")?.OldValue;
+	public bool? EnabledAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "enabled")?.NewValue;
+
+	public bool SyncingChanged => this.SyncingBefore is not null || this.SyncingAfter is not null;
+	public bool? SyncingBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "syncing")?.OldValue;
+	public bool? SyncingAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "syncing")?.NewValue;
+
+	public bool RoleIdChanged => this.RoleIdBefore is not null || this.RoleIdAfter is not null;
+	public ulong? RoleIdBefore => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "role_id")?.OldValue;
+	public ulong? RoleIdAfter => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "role_id")?.NewValue;
+	public DiscordRole? RoleBefore => this.Discord.Guilds[this.GuildId].Roles.TryGetValue(this.RoleIdBefore ?? 0ul, out var role) ? role : null;
+	public DiscordRole? RoleAfter => this.Discord.Guilds[this.GuildId].Roles.TryGetValue(this.RoleIdAfter ?? 0ul, out var role) ? role : null;
+
+	public bool EnableEmoticonsChanged => this.EnableEmoticonsBefore is not null || this.EnableEmoticonsAfter is not null;
+	public bool? EnableEmoticonsBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "enable_emoticons")?.OldValue;
+	public bool? EnableEmoticonsAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "enable_emoticons")?.NewValue;
+
+	public bool ExpireBehaviorChanged => this.ExpireBehaviorBefore is not null || this.ExpireBehaviorAfter is not null;
+	public IntegrationExpireBehavior? ExpireBehaviorBefore => (IntegrationExpireBehavior?)this.Changes.FirstOrDefault(x => x.Key == "expire_behavior")?.OldValue;
+	public IntegrationExpireBehavior? ExpireBehaviorAfter => (IntegrationExpireBehavior?)this.Changes.FirstOrDefault(x => x.Key == "expire_behavior")?.NewValue;
+
+	public bool ExpireGracePeriodChanged => this.ExpireGracePeriodBefore is not null || this.ExpireGracePeriodAfter is not null;
+	public int? ExpireGracePeriodBefore => (int?)this.Changes.FirstOrDefault(x => x.Key == "expire_grace_period")?.OldValue;
+	public int? ExpireGracePeriodAfter => (int?)this.Changes.FirstOrDefault(x => x.Key == "expire_grace_period")?.NewValue;
+
+	public bool AccountChanged => this.AccountBefore is not null || this.AccountAfter is not null;
+	public DiscordIntegrationAccount? AccountBefore => (DiscordIntegrationAccount?)this.Changes.FirstOrDefault(x => x.Key == "account")?.OldValue;
+	public DiscordIntegrationAccount? AccountAfter => (DiscordIntegrationAccount?)this.Changes.FirstOrDefault(x => x.Key == "account")?.NewValue;
+
+	public bool RevokedChanged => this.RevokedBefore is not null || this.RevokedAfter is not null;
+	public bool? RevokedBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "revoked")?.OldValue;
+	public bool? RevokedAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "revoked")?.NewValue;
+
+	public bool ScopesChanged => this.ScopesBefore is not null || this.ScopesAfter is not null;
+	public IReadOnlyList<string>? ScopesBefore => (IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "scopes")?.OldValue;
+	public IReadOnlyList<string>? ScopesAfter => (IReadOnlyList<string>?)this.Changes.FirstOrDefault(x => x.Key == "scopes")?.NewValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/InviteCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/InviteCreateChangeSet.cs
new file mode 100644
index 0000000000..bd9e19365e
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/InviteCreateChangeSet.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for creating a server invite.
+/// </summary>
+public sealed class InviteCreateChangeSet : DiscordAuditLogEntry
+{
+	public InviteCreateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.InviteCreate;
+
+		var rawMaxAge = this.MaxAge;
+		this.ExpiryDateTime = rawMaxAge is not null && rawMaxAge != 0 ? DateTime.UtcNow.AddSeconds(rawMaxAge ?? 0) : null;
+	}
+
+	public string Code => (string?)this.Changes.FirstOrDefault(x => x.Key == "code")?.NewValue;
+	public string Url => DiscordDomain.GetDomain(CoreDomain.DiscordShortlink).Url + "/" + this.Code;
+
+	public ulong? ChannelId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "channel_id")?.NewValue;
+	public DiscordChannel? Channel => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ChannelId ?? 0ul, out var channel) ? channel : null;
+
+	public ulong? InviterId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "inviter_id")?.NewValue;
+	public DiscordUser? Inviter => this.InviterId is null ? null : this.Discord.GetCachedOrEmptyUserInternal(this.InviterId.Value);
+
+	public int? Uses => (int?)this.Changes.FirstOrDefault(x => x.Key == "uses")?.NewValue;
+	public int? MaxUses => (int?)this.Changes.FirstOrDefault(x => x.Key == "max_uses")?.NewValue;
+	public int? MaxAge => (int?)this.Changes.FirstOrDefault(x => x.Key == "max_age")?.NewValue;
+	public DateTime? ExpiryDateTime { get; internal set; } = null;
+	public bool? Temporary => (bool?)this.Changes.FirstOrDefault(x => x.Key == "temporary")?.NewValue;
+	public InviteFlags? Flags => (InviteFlags?)this.Changes.FirstOrDefault(x => x.Key == "flags")?.NewValue;
+
+	public TargetType? TargetType => (TargetType?)this.Changes.FirstOrDefault(x => x.Key == "target_type")?.NewValue;
+	public DiscordUser? TargetUser => (DiscordUser?)this.Changes.FirstOrDefault(x => x.Key == "target_user")?.NewValue;
+	public DiscordApplication? TargetApplication => (DiscordApplication?)this.Changes.FirstOrDefault(x => x.Key == "target_application")?.NewValue;
+	public DiscordStageInstance? TargetStage => (DiscordStageInstance?)this.Changes.FirstOrDefault(x => x.Key == "stage_instance")?.NewValue;
+	public DiscordScheduledEvent? TargetEvent => (DiscordScheduledEvent?)this.Changes.FirstOrDefault(x => x.Key == "guild_scheduled_event")?.NewValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/InviteDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/InviteDeleteChangeSet.cs
new file mode 100644
index 0000000000..17b7aaec27
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/InviteDeleteChangeSet.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting a server invite.
+/// </summary>
+public sealed class InviteDeleteChangeSet : DiscordAuditLogEntry
+{
+	public InviteDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.InviteCreate;
+
+		var rawMaxAge = this.MaxAge;
+		this.ExpiryDateTime = rawMaxAge is not null && rawMaxAge != 0 ? DateTime.UtcNow.AddSeconds(rawMaxAge ?? 0) : null;
+	}
+
+	public string Code => (string?)this.Changes.FirstOrDefault(x => x.Key == "code")?.OldValue;
+	public string Url => DiscordDomain.GetDomain(CoreDomain.DiscordShortlink).Url + "/" + this.Code;
+
+	public ulong? ChannelId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "channel_id")?.OldValue;
+	public DiscordChannel? Channel => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ChannelId ?? 0ul, out var channel) ? channel : null;
+
+	public ulong? InviterId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "inviter_id")?.OldValue;
+	public DiscordUser? Inviter => this.InviterId is null ? null : this.Discord.GetCachedOrEmptyUserInternal(this.InviterId.Value);
+
+	public int? Uses => (int?)this.Changes.FirstOrDefault(x => x.Key == "uses")?.OldValue;
+	public int? MaxUses => (int?)this.Changes.FirstOrDefault(x => x.Key == "max_uses")?.OldValue;
+	public int? MaxAge => (int?)this.Changes.FirstOrDefault(x => x.Key == "max_age")?.OldValue;
+	public DateTime? ExpiryDateTime { get; internal set; } = null;
+	public bool? Temporary => (bool?)this.Changes.FirstOrDefault(x => x.Key == "temporary")?.OldValue;
+	public InviteFlags? Flags => (InviteFlags?)this.Changes.FirstOrDefault(x => x.Key == "flags")?.OldValue;
+
+	public TargetType? TargetType => (TargetType?)this.Changes.FirstOrDefault(x => x.Key == "target_type")?.OldValue;
+	public DiscordUser? TargetUser => (DiscordUser?)this.Changes.FirstOrDefault(x => x.Key == "target_user")?.OldValue;
+	public DiscordApplication? TargetApplication => (DiscordApplication?)this.Changes.FirstOrDefault(x => x.Key == "target_application")?.OldValue;
+	public DiscordStageInstance? TargetStage => (DiscordStageInstance?)this.Changes.FirstOrDefault(x => x.Key == "stage_instance")?.OldValue;
+	public DiscordScheduledEvent? TargetEvent => (DiscordScheduledEvent?)this.Changes.FirstOrDefault(x => x.Key == "guild_scheduled_event")?.OldValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/InviteUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/InviteUpdateChangeSet.cs
new file mode 100644
index 0000000000..46cbef951b
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/InviteUpdateChangeSet.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating a server invite.
+/// </summary>
+public sealed class InviteUpdateChangeSet : DiscordAuditLogEntry
+{
+	public InviteUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.InviteUpdate;
+
+		var rawMaxAgeBefore = this.MaxAgeBefore;
+		this.ExpiryDateTimeBefore = rawMaxAgeBefore is not null && rawMaxAgeBefore != 0 ? DateTime.UtcNow.AddSeconds(rawMaxAgeBefore.Value) : null;
+
+		var rawMaxAgeAfter = this.MaxAgeAfter;
+		this.ExpiryDateTimeAfter = rawMaxAgeAfter is not null && rawMaxAgeAfter != 0 ? DateTime.UtcNow.AddSeconds(rawMaxAgeAfter.Value) : null;
+	}
+
+	public bool CodeChanged => this.CodeBefore is not null || this.CodeAfter is not null;
+	public string CodeBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "code")?.OldValue;
+	public string CodeAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "code")?.OldValue;
+	public string UrlBefore => DiscordDomain.GetDomain(CoreDomain.DiscordShortlink).Url + "/" + this.CodeBefore;
+	public string UrlAfter => DiscordDomain.GetDomain(CoreDomain.DiscordShortlink).Url + "/" + this.CodeAfter;
+
+	public bool ChannelIdChanged => this.ChannelIdBefore is not null || this.ChannelIdAfter is not null;
+	public ulong? ChannelIdBefore => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "channel_id")?.OldValue;
+	public ulong? ChannelIdAfter => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "channel_id")?.NewValue;
+	public DiscordChannel? ChannelBefore => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ChannelIdBefore ?? 0ul, out var channel) ? channel : null;
+	public DiscordChannel? ChannelAfter => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ChannelIdAfter ?? 0ul, out var channel) ? channel : null;
+
+	public bool InviterIdChanged => this.InviterIdBefore is not null || this.InviterIdAfter is not null;
+	public ulong? InviterIdBefore => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "inviter_id")?.OldValue;
+	public ulong? InviterIdAfter => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "inviter_id")?.NewValue;
+	public DiscordUser? InviterBefore => this.InviterIdBefore is null ? null : this.Discord.GetCachedOrEmptyUserInternal(this.InviterIdBefore.Value);
+	public DiscordUser? InviterAfter => this.InviterAfter is null ? null : this.Discord.GetCachedOrEmptyUserInternal(this.InviterIdAfter.Value);
+
+	public bool UsesChanged => this.UsesBefore is not null || this.UsesAfter is not null;
+	public int? UsesBefore => (int?)this.Changes.FirstOrDefault(x => x.Key == "uses")?.OldValue;
+	public int? UsesAfter => (int?)this.Changes.FirstOrDefault(x => x.Key == "uses")?.NewValue;
+
+	public bool MaxUsesChanged => this.MaxUsesBefore is not null || this.MaxUsesAfter is not null;
+	public int? MaxUsesBefore => (int?)this.Changes.FirstOrDefault(x => x.Key == "max_uses")?.OldValue;
+	public int? MaxUsesAfter => (int?)this.Changes.FirstOrDefault(x => x.Key == "max_uses")?.NewValue;
+
+	public bool MaxAgeChanged => this.MaxAgeBefore is not null || this.MaxAgeAfter is not null;
+	public int? MaxAgeBefore => (int?)this.Changes.FirstOrDefault(x => x.Key == "max_age")?.OldValue;
+	public int? MaxAgeAfter => (int?)this.Changes.FirstOrDefault(x => x.Key == "max_age")?.NewValue;
+	public DateTime? ExpiryDateTimeBefore { get; internal set; } = null;
+	public DateTime? ExpiryDateTimeAfter { get; internal set; } = null;
+
+	public bool TemporaryChanged => this.TemporaryBefore is not null || this.TemporaryAfter is not null;
+	public bool? TemporaryBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "temporary")?.OldValue;
+	public bool? TemporaryAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "temporary")?.NewValue;
+
+	public bool FlagsChanged => this.FlagsBefore is not null || this.FlagsAfter is not null;
+	public InviteFlags? FlagsBefore => (InviteFlags?)this.Changes.FirstOrDefault(x => x.Key == "flags")?.OldValue;
+	public InviteFlags? FlagsAfter => (InviteFlags?)this.Changes.FirstOrDefault(x => x.Key == "flags")?.NewValue;
+
+	public bool TargetTypeChanged => this.TargetTypeBefore is not null || this.TargetTypeAfter is not null;
+	public TargetType? TargetTypeBefore => (TargetType?)this.Changes.FirstOrDefault(x => x.Key == "target_type")?.OldValue;
+	public TargetType? TargetTypeAfter => (TargetType?)this.Changes.FirstOrDefault(x => x.Key == "target_type")?.NewValue;
+
+	public bool TargetUserChanged => this.TargetUserBefore is not null || this.TargetUserAfter is not null;
+	public DiscordUser? TargetUserBefore => (DiscordUser?)this.Changes.FirstOrDefault(x => x.Key == "target_user")?.OldValue;
+	public DiscordUser? TargetUserAfter => (DiscordUser?)this.Changes.FirstOrDefault(x => x.Key == "target_user")?.NewValue;
+
+	public bool TargetApplicationChanged => this.TargetApplicationBefore is not null || this.TargetApplicationAfter is not null;
+	public DiscordApplication? TargetApplicationBefore => (DiscordApplication?)this.Changes.FirstOrDefault(x => x.Key == "target_application")?.OldValue;
+	public DiscordApplication? TargetApplicationAfter => (DiscordApplication?)this.Changes.FirstOrDefault(x => x.Key == "target_application")?.NewValue;
+
+	public bool TargetStageChanged => this.TargetStageBefore is not null || this.TargetStageAfter is not null;
+	public DiscordStageInstance? TargetStageBefore => (DiscordStageInstance?)this.Changes.FirstOrDefault(x => x.Key == "stage_instance")?.OldValue;
+	public DiscordStageInstance? TargetStageAfter => (DiscordStageInstance?)this.Changes.FirstOrDefault(x => x.Key == "stage_instance")?.NewValue;
+
+	public bool TargetEventChanged => this.TargetEventBefore is not null || this.TargetEventAfter is not null;
+	public DiscordScheduledEvent? TargetEventBefore => (DiscordScheduledEvent?)this.Changes.FirstOrDefault(x => x.Key == "guild_scheduled_event")?.OldValue;
+	public DiscordScheduledEvent? TargetEventAfter => (DiscordScheduledEvent?)this.Changes.FirstOrDefault(x => x.Key == "guild_scheduled_event")?.NewValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberBanAddChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberBanAddChangeSet.cs
new file mode 100644
index 0000000000..e408dfb076
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberBanAddChangeSet.cs
@@ -0,0 +1,23 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for banning a member from the server.
+/// </summary>
+public sealed class MemberBanAddChangeSet : DiscordAuditLogEntry
+{
+	public MemberBanAddChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MemberBanAdd;
+	}
+
+	/// <summary>
+	/// Gets the user who was banned.
+	/// </summary>
+	public DiscordUser Target => this.Discord.GetCachedOrEmptyUserInternal(this.TargetId!.Value);
+
+	/// <inheritdoc />
+	internal override string? ChangeDescription
+		=> $"{this.User} banned {this.Target} with reason {this.Reason ?? "No reason given".Italic()}";
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberBanRemoveChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberBanRemoveChangeSet.cs
new file mode 100644
index 0000000000..71d4d9aa95
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberBanRemoveChangeSet.cs
@@ -0,0 +1,23 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for lifting a server ban for a member.
+/// </summary>
+public sealed class MemberBanRemoveChangeSet : DiscordAuditLogEntry
+{
+	public MemberBanRemoveChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MemberBanRemove;
+	}
+
+	/// <summary>
+	/// Gets the user who was unbanned.
+	/// </summary>
+	public DiscordUser Target => this.Discord.GetCachedOrEmptyUserInternal(this.TargetId!.Value);
+
+	/// <inheritdoc />
+	internal override string? ChangeDescription
+		=> $"{this.User} unbanned {this.Target} with reason {this.Reason ?? "No reason given".Italic()}";
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberDisconnectChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberDisconnectChangeSet.cs
new file mode 100644
index 0000000000..e550b007dc
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberDisconnectChangeSet.cs
@@ -0,0 +1,30 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for disconnecting a member from a voice channel.
+/// </summary>
+public sealed class MemberDisconnectChangeSet : DiscordAuditLogEntry
+{
+	public MemberDisconnectChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MemberDisconnect;
+	}
+
+	/// <summary>
+	/// Gets the count of members that were disconnected.
+	/// </summary>
+	public int Count => this.Options!.Count.Value;
+
+	/// <summary>
+	/// Gets the channel from which the members were disconnected.
+	/// </summary>
+	public DiscordChannel Channel => this.Discord.Guilds[this.GuildId].GetChannel(this.TargetId.Value!);
+
+	/// <inheritdoc />
+	internal override string? ChangeDescription
+		=> $"{this.User} disconnected {this.Count} users from {this.Channel} with reason {this.Reason ?? "No reason given".Italic()}";
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberKickChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberKickChangeSet.cs
new file mode 100644
index 0000000000..13bac7641b
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberKickChangeSet.cs
@@ -0,0 +1,23 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for removing a member from the server.
+/// </summary>
+public sealed class MemberKickChangeSet : DiscordAuditLogEntry
+{
+	public MemberKickChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MemberKick;
+	}
+
+	/// <summary>
+	/// Gets the user who was kicked.
+	/// </summary>
+	public DiscordUser Target => this.Discord.GetCachedOrEmptyUserInternal(this.TargetId!.Value);
+
+	/// <inheritdoc />
+	internal override string? ChangeDescription
+		=> $"{this.User} kicked {this.Target} with reason {this.Reason ?? "No reason given".Italic()}";
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberMoveChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberMoveChangeSet.cs
new file mode 100644
index 0000000000..ec81002008
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberMoveChangeSet.cs
@@ -0,0 +1,21 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for moving a member to a different voice channel.
+/// </summary>
+public sealed class MemberMoveChangeSet : DiscordAuditLogEntry
+{
+	public MemberMoveChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MemberMove;
+	}
+
+	public int Count => (int)this.Options!.Count;
+
+	public ulong ChannelId => (ulong)this.Options!.ChannelId;
+	public DiscordChannel? Channel => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ChannelId, out var channel) ? channel : null;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberPruneChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberPruneChangeSet.cs
new file mode 100644
index 0000000000..aad1687882
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberPruneChangeSet.cs
@@ -0,0 +1,23 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for pruning members from the server.
+/// </summary>
+public sealed class MemberPruneChangeSet : DiscordAuditLogEntry
+{
+	public MemberPruneChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MemberPrune;
+	}
+
+	public int DeleteMemberDays => (int)this.Changes.FirstOrDefault(x => x.Key == "delete_member_days")?.OldValue;
+	public int Count => (int)this.Changes.FirstOrDefault(x => x.Key == "members_removed")?.OldValue;
+
+	/// <inheritdoc />
+	internal override string? ChangeDescription
+		=> $"{this.User} pruned {this.Count} members with reason {this.Reason ?? "none"} and deleted messages from the last {this.DeleteMemberDays} days";
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberRoleUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberRoleUpdateChangeSet.cs
new file mode 100644
index 0000000000..43655dbb3d
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberRoleUpdateChangeSet.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for adding or removing a role from a member.
+/// </summary>
+public sealed class MemberRoleUpdateChangeSet : DiscordAuditLogEntry
+{
+	public MemberRoleUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MemberRoleUpdate;
+	}
+
+	public IReadOnlyList<DiscordRole> AddedRoles
+		=> ((IReadOnlyList<DiscordRole>)this.Changes.FirstOrDefault(x => x.Key == "$add")?.OldValue)
+			.Select(x => this.Discord.Guilds[this.GuildId].GetRole(x.Id)).ToList();
+
+	public IReadOnlyList<DiscordRole> RemovedRoles
+		=> ((IReadOnlyList<DiscordRole>)this.Changes.FirstOrDefault(x => x.Key == "$remove")?.OldValue)
+			.Select(x => this.Discord.Guilds[this.GuildId].GetRole(x.Id)).ToList();
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberUpdateChangeSet.cs
new file mode 100644
index 0000000000..3b181f5723
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MemberUpdateChangeSet.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating a member in the server.
+/// </summary>
+public sealed class MemberUpdateChangeSet : DiscordAuditLogEntry
+{
+	public MemberUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MemberUpdate;
+	}
+
+	public bool NicknameChanged => this.NicknameBefore is not null || this.NicknameAfter is not null;
+	public string? NicknameBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "nick")?.OldValue;
+	public string? NicknameAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "nick")?.NewValue;
+
+	public bool AvatarChanged => this.AvatarBefore is not null || this.AvatarAfter is not null;
+	public string? AvatarBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "avatar")?.OldValue;
+	public string? AvatarAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "avatar")?.NewValue;
+
+	public bool DeafChanged => this.DeafBefore is not null || this.DeafAfter is not null;
+	public bool? DeafBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "deaf")?.OldValue;
+	public bool? DeafAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "deaf")?.NewValue;
+
+	public bool MuteChanged => this.MuteBefore is not null || this.MuteAfter is not null;
+	public bool? MuteBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "mute")?.OldValue;
+	public bool? MuteAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "mute")?.NewValue;
+
+	public bool FlagsChanged => this.FlagsBefore is not null || this.FlagsAfter is not null;
+	public MemberFlags? FlagsBefore => (MemberFlags?)this.Changes.FirstOrDefault(x => x.Key == "flags")?.OldValue;
+	public MemberFlags? FlagsAfter => (MemberFlags?)this.Changes.FirstOrDefault(x => x.Key == "flags")?.NewValue;
+
+	public bool PendingChanged => this.PendingBefore is not null || this.PendingAfter is not null;
+	public bool? PendingBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "pending")?.OldValue;
+	public bool? PendingAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "pending")?.NewValue;
+
+	public bool CommunicationDisabledUntilChanged => this.CommunicationDisabledUntilBefore is not null || this.CommunicationDisabledUntilAfter is not null;
+	public DateTimeOffset? CommunicationDisabledUntilBefore => (DateTimeOffset?)this.Changes.FirstOrDefault(x => x.Key == "communication_disabled_until")?.OldValue;
+	public DateTimeOffset? CommunicationDisabledUntilAfter => (DateTimeOffset?)this.Changes.FirstOrDefault(x => x.Key == "communication_disabled_until")?.NewValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessageBulkDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessageBulkDeleteChangeSet.cs
new file mode 100644
index 0000000000..7e80dd4f3a
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessageBulkDeleteChangeSet.cs
@@ -0,0 +1,18 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting multiple messages.
+/// </summary>
+public sealed class MessageBulkDeleteChangeSet : DiscordAuditLogEntry
+{
+	public MessageBulkDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MessageBulkDelete;
+	}
+
+	public DiscordChannel Channel => this.Discord.Guilds[this.GuildId].Channels[this.TargetId!.Value];
+
+	public int Count => (int)this.Options.Count;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessageDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessageDeleteChangeSet.cs
new file mode 100644
index 0000000000..74ccd2853f
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessageDeleteChangeSet.cs
@@ -0,0 +1,21 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting a single message.
+/// </summary>
+public sealed class MessageDeleteChangeSet : DiscordAuditLogEntry
+{
+	public MessageDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MessageDelete;
+	}
+
+	public DiscordUser Target => this.Discord.GetCachedOrEmptyUserInternal(this.TargetId!.Value);
+
+	public int Count => (int)this.Options.Count;
+
+	public ulong ChannelId => (ulong)this.Options.ChannelId;
+	public DiscordChannel? Channel => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ChannelId, out var channel) ? channel : null;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessagePinChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessagePinChangeSet.cs
new file mode 100644
index 0000000000..f5353f34f5
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessagePinChangeSet.cs
@@ -0,0 +1,22 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for pinning a message to a channel.
+/// </summary>
+public sealed class MessagePinChangeSet : DiscordAuditLogEntry
+{
+	public MessagePinChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MessagePin;
+	}
+
+	public DiscordUser Target => this.Discord.GetCachedOrEmptyUserInternal(this.TargetId!.Value);
+
+	public ulong ChannelId => (ulong)this.Options.ChannelId;
+	public DiscordChannel? Channel => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ChannelId, out var channel) ? channel : null;
+
+	public ulong MessageId => (ulong)this.Options.MessageId;
+	public DiscordMessage? Message => this.Discord.MessageCache.TryGet(x => x.Id == this.MessageId, out var message) ? message : null;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessageUnpinChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessageUnpinChangeSet.cs
new file mode 100644
index 0000000000..ac764da826
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/MessageUnpinChangeSet.cs
@@ -0,0 +1,22 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for unpinning a message from a channel.
+/// </summary>
+public sealed class MessageUnpinChangeSet : DiscordAuditLogEntry
+{
+	public MessageUnpinChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.MessageUnpin;
+	}
+
+	public DiscordUser Target => this.Discord.GetCachedOrEmptyUserInternal(this.TargetId!.Value);
+
+	public ulong ChannelId => (ulong)this.Options.ChannelId;
+	public DiscordChannel? Channel => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ChannelId, out var channel) ? channel : null;
+
+	public ulong MessageId => (ulong)this.Options.MessageId;
+	public DiscordMessage? Message => this.Discord.MessageCache.TryGet(x => x.Id == this.MessageId, out var message) ? message : null;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/RoleCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/RoleCreateChangeSet.cs
new file mode 100644
index 0000000000..46249248be
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/RoleCreateChangeSet.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for creating a role.
+/// </summary>
+public sealed class RoleCreateChangeSet : DiscordAuditLogEntry
+{
+	public RoleCreateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.RoleCreate;
+	}
+
+	public DiscordRole Role => this.Discord.Guilds[this.GuildId].GetRole(this.TargetId.Value!);
+
+	public string Name => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+	public DiscordColor Color => new((int)this.Changes.FirstOrDefault(x => x.Key == "color")?.NewValue);
+	public bool IsHoisted => (bool)this.Changes.FirstOrDefault(x => x.Key == "hoist")?.NewValue;
+	public bool IsManaged => (bool)this.Changes.FirstOrDefault(x => x.Key == "managed")?.NewValue;
+	public bool IsMentionable => (bool)this.Changes.FirstOrDefault(x => x.Key == "mentionable")?.NewValue;
+	public string? IconHash => (string?)this.Changes.FirstOrDefault(x => x.Key == "icon")?.NewValue;
+	public string? UnicodeEmoji => (string?)this.Changes.FirstOrDefault(x => x.Key == "unicode_emoji")?.NewValue;
+	public int Position => (int)this.Changes.FirstOrDefault(x => x.Key == "position")?.NewValue;
+	public Permissions Permissions => (Permissions)Convert.ToInt64(this.Changes.FirstOrDefault(x => x.Key == "permissions")?.NewValue);
+	public DiscordRoleTags Tags => (DiscordRoleTags)this.Changes.FirstOrDefault(x => x.Key == "tags")?.NewValue;
+	public RoleFlags Flags => (RoleFlags)this.Changes.FirstOrDefault(x => x.Key == "flags")?.NewValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/RoleDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/RoleDeleteChangeSet.cs
new file mode 100644
index 0000000000..482e25143d
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/RoleDeleteChangeSet.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting a role.
+/// </summary>
+public sealed class RoleDeleteChangeSet : DiscordAuditLogEntry
+{
+	public RoleDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.RoleDelete;
+	}
+
+	public DiscordRole Role => this.Discord.Guilds[this.GuildId].GetRole(this.TargetId.Value!);
+
+	public string Name => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public DiscordColor Color => new((int)this.Changes.FirstOrDefault(x => x.Key == "color")?.OldValue);
+	public bool IsHoisted => (bool)this.Changes.FirstOrDefault(x => x.Key == "hoist")?.OldValue;
+	public bool IsManaged => (bool)this.Changes.FirstOrDefault(x => x.Key == "managed")?.OldValue;
+	public bool IsMentionable => (bool)this.Changes.FirstOrDefault(x => x.Key == "mentionable")?.OldValue;
+	public string? IconHash => (string?)this.Changes.FirstOrDefault(x => x.Key == "icon")?.OldValue;
+	public string? UnicodeEmoji => (string?)this.Changes.FirstOrDefault(x => x.Key == "unicode_emoji")?.OldValue;
+	public int Position => (int)this.Changes.FirstOrDefault(x => x.Key == "position")?.OldValue;
+	public Permissions Permissions => (Permissions)Convert.ToInt64(this.Changes.FirstOrDefault(x => x.Key == "permissions")?.OldValue);
+	public DiscordRoleTags Tags => (DiscordRoleTags)this.Changes.FirstOrDefault(x => x.Key == "tags")?.OldValue;
+	public RoleFlags Flags => (RoleFlags)this.Changes.FirstOrDefault(x => x.Key == "flags")?.OldValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/RoleUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/RoleUpdateChangeSet.cs
new file mode 100644
index 0000000000..1e358d154c
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/RoleUpdateChangeSet.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for editing a role.
+/// </summary>
+public sealed class RoleUpdateChangeSet : DiscordAuditLogEntry
+{
+	public RoleUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.RoleUpdate;
+	}
+
+	public DiscordRole Role => this.Discord.Guilds[this.GuildId].GetRole(this.TargetId.Value!);
+
+	public bool NameChanged => this.NameBefore is not null || this.NameAfter is not null;
+	public string? NameBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public string? NameAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+
+	public bool ColorChanged => this.ColorBefore is not null || this.ColorAfter is not null;
+	public DiscordColor? ColorBefore => new((int)this.Changes.FirstOrDefault(x => x.Key == "color")?.OldValue);
+	public DiscordColor? ColorAfter => new((int)this.Changes.FirstOrDefault(x => x.Key == "color")?.NewValue);
+
+	public bool IsHoistedChanged => this.IsHoistedBefore is not null || this.IsHoistedAfter is not null;
+	public bool? IsHoistedBefore => (bool)this.Changes.FirstOrDefault(x => x.Key == "hoist")?.OldValue;
+	public bool? IsHoistedAfter => (bool)this.Changes.FirstOrDefault(x => x.Key == "hoist")?.NewValue;
+
+	public bool IsManagedChanged => this.IsManagedBefore is not null || this.IsManagedAfter is not null;
+	public bool? IsManagedBefore => (bool)this.Changes.FirstOrDefault(x => x.Key == "managed")?.OldValue;
+	public bool? IsManagedAfter => (bool)this.Changes.FirstOrDefault(x => x.Key == "managed")?.NewValue;
+
+	public bool IsMentionableChanged => this.IsMentionableBefore is not null || this.IsMentionableAfter is not null;
+	public bool? IsMentionableBefore => (bool)this.Changes.FirstOrDefault(x => x.Key == "mentionable")?.OldValue;
+	public bool? IsMentionableAfter => (bool)this.Changes.FirstOrDefault(x => x.Key == "mentionable")?.NewValue;
+
+	public bool IconHashChanged => this.IconHashBefore is not null || this.IconHashAfter is not null;
+	public string? IconHashBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "icon")?.OldValue;
+	public string? IconHashAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "icon")?.NewValue;
+
+	public bool UnicodeEmojiChanged => this.UnicodeEmojiBefore is not null || this.UnicodeEmojiAfter is not null;
+	public string? UnicodeEmojiBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "unicode_emoji")?.OldValue;
+	public string? UnicodeEmojiAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "unicode_emoji")?.NewValue;
+
+	public bool PositionChanged => this.PositionBefore is not null || this.PositionAfter is not null;
+	public int? PositionBefore => (int)this.Changes.FirstOrDefault(x => x.Key == "position")?.OldValue;
+	public int? PositionAfter => (int)this.Changes.FirstOrDefault(x => x.Key == "position")?.NewValue;
+
+	public bool PermissionsChanged => this.PermissionsBefore is not null || this.PermissionsAfter is not null;
+	public Permissions? PermissionsBefore => (Permissions)Convert.ToInt64(this.Changes.FirstOrDefault(x => x.Key == "permissions")?.OldValue);
+	public Permissions? PermissionsAfter => (Permissions)Convert.ToInt64(this.Changes.FirstOrDefault(x => x.Key == "permissions")?.NewValue);
+
+	public bool TagsChanged => this.TagsBefore is not null || this.TagsAfter is not null;
+	public DiscordRoleTags? TagsBefore => (DiscordRoleTags)this.Changes.FirstOrDefault(x => x.Key == "tags")?.OldValue;
+	public DiscordRoleTags? TagsAfter => (DiscordRoleTags)this.Changes.FirstOrDefault(x => x.Key == "tags")?.NewValue;
+
+	public bool FlagsChanged => this.FlagsBefore is not null || this.FlagsAfter is not null;
+	public RoleFlags? FlagsBefore => (RoleFlags)this.Changes.FirstOrDefault(x => x.Key == "flags")?.OldValue;
+	public RoleFlags? FlagsAfter => (RoleFlags)this.Changes.FirstOrDefault(x => x.Key == "flags")?.NewValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/StickerCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/StickerCreateChangeSet.cs
new file mode 100644
index 0000000000..7fa4e2df90
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/StickerCreateChangeSet.cs
@@ -0,0 +1,23 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for creating a sticker.
+/// </summary>
+public sealed class StickerCreateChangeSet : DiscordAuditLogEntry
+{
+	public StickerCreateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.StickerCreate;
+	}
+
+	public string Name => (string)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+	public string Description => (string)this.Changes.FirstOrDefault(x => x.Key == "description")?.NewValue;
+	public string Tags => (string)this.Changes.FirstOrDefault(x => x.Key == "tags")?.NewValue;
+	public StickerType StickerType => (StickerType)this.Changes.FirstOrDefault(x => x.Key == "type")?.NewValue;
+	public StickerFormat FormatType => (StickerFormat)this.Changes.FirstOrDefault(x => x.Key == "format_type")?.NewValue;
+	public bool? IsAvailable => (bool?)this.Changes.FirstOrDefault(x => x.Key == "available")?.NewValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/StickerDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/StickerDeleteChangeSet.cs
new file mode 100644
index 0000000000..6d7daac0ae
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/StickerDeleteChangeSet.cs
@@ -0,0 +1,23 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting a sticker.
+/// </summary>
+public sealed class StickerDeleteChangeSet : DiscordAuditLogEntry
+{
+	public StickerDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.StickerDelete;
+	}
+
+	public string Name => (string)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public string Description => (string)this.Changes.FirstOrDefault(x => x.Key == "description")?.OldValue;
+	public string Tags => (string)this.Changes.FirstOrDefault(x => x.Key == "tags")?.OldValue;
+	public StickerType StickerType => (StickerType)this.Changes.FirstOrDefault(x => x.Key == "type")?.OldValue;
+	public StickerFormat FormatType => (StickerFormat)this.Changes.FirstOrDefault(x => x.Key == "format_type")?.OldValue;
+	public bool? IsAvailable => (bool?)this.Changes.FirstOrDefault(x => x.Key == "available")?.OldValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/StickerUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/StickerUpdateChangeSet.cs
new file mode 100644
index 0000000000..f48b06faaf
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/StickerUpdateChangeSet.cs
@@ -0,0 +1,40 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating sticker details.
+/// </summary>
+public sealed class StickerUpdateChangeSet : DiscordAuditLogEntry
+{
+	public StickerUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.StickerUpdate;
+	}
+
+	public bool NameChanged => this.NameBefore is not null || this.NameAfter is not null;
+	public string? NameBefore => (string)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+	public string? NameAfter => (string)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+
+	public bool DescriptionChanged => this.DescriptionBefore is not null || this.DescriptionAfter is not null;
+	public string? DescriptionBefore => (string)this.Changes.FirstOrDefault(x => x.Key == "description")?.OldValue;
+	public string? DescriptionAfter => (string)this.Changes.FirstOrDefault(x => x.Key == "description")?.NewValue;
+
+	public bool TagsChanged => this.TagsBefore is not null || this.TagsAfter is not null;
+	public string? TagsBefore => (string)this.Changes.FirstOrDefault(x => x.Key == "tags")?.OldValue;
+	public string? TagsAfter => (string)this.Changes.FirstOrDefault(x => x.Key == "tags")?.NewValue;
+
+	public bool StickerTypeChanged => this.StickerTypeBefore is not null || this.StickerTypeAfter is not null;
+	public StickerType? StickerTypeBefore => (StickerType)this.Changes.FirstOrDefault(x => x.Key == "type")?.OldValue;
+	public StickerType? StickerTypeAfter => (StickerType)this.Changes.FirstOrDefault(x => x.Key == "type")?.NewValue;
+
+	public bool FormatTypeChanged => this.FormatTypeBefore is not null || this.FormatTypeAfter is not null;
+	public StickerFormat? FormatTypeBefore => (StickerFormat)this.Changes.FirstOrDefault(x => x.Key == "format_type")?.OldValue;
+	public StickerFormat? FormatTypeAfter => (StickerFormat)this.Changes.FirstOrDefault(x => x.Key == "format_type")?.NewValue;
+
+	public bool IsAvailableChanged => this.IsAvailableBefore is not null || this.IsAvailableAfter is not null;
+	public bool? IsAvailableBefore => (bool?)this.Changes.FirstOrDefault(x => x.Key == "available")?.OldValue;
+	public bool? IsAvailableAfter => (bool?)this.Changes.FirstOrDefault(x => x.Key == "available")?.NewValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/VoiceChannelStatusDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/VoiceChannelStatusDeleteChangeSet.cs
new file mode 100644
index 0000000000..2df12e5cc0
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/VoiceChannelStatusDeleteChangeSet.cs
@@ -0,0 +1,18 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting voice channel status.
+/// </summary>
+public sealed class VoiceChannelStatusDeleteChangeSet : DiscordAuditLogEntry
+{
+	public VoiceChannelStatusDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.VoiceChannelStatusDelete;
+	}
+
+	public ulong ChannelId => (ulong)this.Options!.ChannelId;
+	public DiscordChannel? Channel => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ChannelId, out var channel) ? channel : null;
+
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/VoiceChannelStatusUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/VoiceChannelStatusUpdateChangeSet.cs
new file mode 100644
index 0000000000..a822cf51da
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/VoiceChannelStatusUpdateChangeSet.cs
@@ -0,0 +1,18 @@
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating voice channel status.
+/// </summary>
+public sealed class VoiceChannelStatusUpdateChangeSet : DiscordAuditLogEntry
+{
+	public VoiceChannelStatusUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.VoiceChannelStatusUpdate;
+	}
+
+	public ulong ChannelId => (ulong)this.Options!.ChannelId;
+	public DiscordChannel? Channel => this.Discord.Guilds[this.GuildId].Channels.TryGetValue(this.ChannelId, out var channel) ? channel : null;
+	public string Status => this.Options!.Status!;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/WebhookCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/WebhookCreateChangeSet.cs
new file mode 100644
index 0000000000..d590c59976
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/WebhookCreateChangeSet.cs
@@ -0,0 +1,56 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for creating a webhook.
+/// </summary>
+public sealed class WebhookCreateChangeSet : DiscordAuditLogEntry
+{
+	public WebhookCreateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.WebhookCreate;
+	}
+
+	/// <summary>
+	/// Gets the type of the webhook.
+	/// </summary>
+	public WebhookType Type => (WebhookType)this.Changes.FirstOrDefault(x => x.Key == "type")?.NewValue;
+
+	/// <summary>
+	/// Gets the name of the webhook.
+	/// </summary>
+	public string? Name => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+
+	/// <summary>
+	/// Gets the avatar hash of the webhook.
+	/// </summary>
+	public string? Avatar => (string?)this.Changes.FirstOrDefault(x => x.Key == "avatar_hash")?.NewValue;
+
+	/// <summary>
+	/// Gets the token of the webhook.
+	/// </summary>
+	public string? Token => (string?)this.Changes.FirstOrDefault(x => x.Key == "token")?.NewValue;
+
+	/// <summary>
+	/// Gets the application id of the webhook, if applicable.
+	/// </summary>
+	public ulong? ApplicationId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "application_id")?.NewValue;
+
+	/// <summary>
+	/// Gets the source guild id of the webhook, if applicable.
+	/// </summary>
+	public ulong? SourceGuildId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "source_guild_id")?.NewValue;
+
+	/// <summary>
+	/// Gets the source channel id of the webhook, if applicable.
+	/// </summary>
+	public ulong? SourceChannelId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "source_channel_id")?.NewValue;
+
+	/// <summary>
+	/// Gets the url of the webhook, if applicable.
+	/// </summary>
+	public string? Url => (string?)this.Changes.FirstOrDefault(x => x.Key == "url")?.NewValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/WebhookDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/WebhookDeleteChangeSet.cs
new file mode 100644
index 0000000000..fab39c268c
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/WebhookDeleteChangeSet.cs
@@ -0,0 +1,56 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting a webhook.
+/// </summary>
+public sealed class WebhookDeleteChangeSet : DiscordAuditLogEntry
+{
+	public WebhookDeleteChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.WebhookDelete;
+	}
+
+	/// <summary>
+	/// Gets the type of the webhook.
+	/// </summary>
+	public WebhookType Type => (WebhookType)this.Changes.FirstOrDefault(x => x.Key == "type")?.OldValue;
+
+	/// <summary>
+	/// Gets the name of the webhook.
+	/// </summary>
+	public string? Name => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+
+	/// <summary>
+	/// Gets the avatar hash of the webhook.
+	/// </summary>
+	public string? Avatar => (string?)this.Changes.FirstOrDefault(x => x.Key == "avatar_hash")?.OldValue;
+
+	/// <summary>
+	/// Gets the token of the webhook.
+	/// </summary>
+	public string? Token => (string?)this.Changes.FirstOrDefault(x => x.Key == "token")?.OldValue;
+
+	/// <summary>
+	/// Gets the application id of the webhook, if applicable.
+	/// </summary>
+	public ulong? ApplicationId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "application_id")?.OldValue;
+
+	/// <summary>
+	/// Gets the source guild id of the webhook, if applicable.
+	/// </summary>
+	public ulong? SourceGuildId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "source_guild_id")?.OldValue;
+
+	/// <summary>
+	/// Gets the source channel id of the webhook, if applicable.
+	/// </summary>
+	public ulong? SourceChannelId => (ulong?)this.Changes.FirstOrDefault(x => x.Key == "source_channel_id")?.OldValue;
+
+	/// <summary>
+	/// Gets the url of the webhook, if applicable.
+	/// </summary>
+	public string? Url => (string?)this.Changes.FirstOrDefault(x => x.Key == "url")?.OldValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/WebhookUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/WebhookUpdateChangeSet.cs
new file mode 100644
index 0000000000..5d4f5f0bc8
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/Done/WebhookUpdateChangeSet.cs
@@ -0,0 +1,46 @@
+using System.Linq;
+
+using DisCatSharp.Enums;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating a webhook or its properties.
+/// </summary>
+public sealed class WebhookUpdateChangeSet : DiscordAuditLogEntry
+{
+	public WebhookUpdateChangeSet()
+	{
+		this.ValidFor = AuditLogActionType.WebhookUpdate;
+	}
+
+	/// <summary>
+	/// Gets a value indicating whether the name of the webhook has changed.
+	/// </summary>
+	public bool NameChanged => this.NameBefore is not null || this.NameAfter is not null;
+
+	/// <summary>
+	/// Gets the old name of the webhook.
+	/// </summary>
+	public string? NameBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.OldValue;
+
+	/// <summary>
+	/// Gets the new name of the webhook.
+	/// </summary>
+	public string? NameAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "name")?.NewValue;
+
+	/// <summary>
+	/// Gets a value indicating whether the avatar hash of the webhook has changed.
+	/// </summary>
+	public bool AvatarChanged => this.AvatarBefore is not null || this.AvatarAfter is not null;
+
+	/// <summary>
+	/// Gets the old avatar hash of the webhook.
+	/// </summary>
+	public string? AvatarBefore => (string?)this.Changes.FirstOrDefault(x => x.Key == "avatar_hash")?.OldValue;
+
+	/// <summary>
+	/// Gets the new avatar hash of the webhook.
+	/// </summary>
+	public string? AvatarAfter => (string?)this.Changes.FirstOrDefault(x => x.Key == "avatar_hash")?.NewValue;
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/GuildScheduledEventCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/GuildScheduledEventCreateChangeSet.cs
new file mode 100644
index 0000000000..8251644d6e
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/GuildScheduledEventCreateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for creating a guild scheduled event.
+/// </summary>
+public sealed class GuildScheduledEventCreateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/GuildScheduledEventDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/GuildScheduledEventDeleteChangeSet.cs
new file mode 100644
index 0000000000..7b7983f0b8
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/GuildScheduledEventDeleteChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for cancelling a guild scheduled event.
+/// </summary>
+public sealed class GuildScheduledEventDeleteChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/GuildScheduledEventUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/GuildScheduledEventUpdateChangeSet.cs
new file mode 100644
index 0000000000..723616129b
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/GuildScheduledEventUpdateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating a guild scheduled event.
+/// </summary>
+public sealed class GuildScheduledEventUpdateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/OnboardingQuestionCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/OnboardingQuestionCreateChangeSet.cs
new file mode 100644
index 0000000000..9815b6085a
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/OnboardingQuestionCreateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for creating an onboarding question.
+/// </summary>
+public sealed class OnboardingQuestionCreateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/OnboardingQuestionUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/OnboardingQuestionUpdateChangeSet.cs
new file mode 100644
index 0000000000..e5bc488dc4
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/OnboardingQuestionUpdateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating an onboarding question.
+/// </summary>
+public sealed class OnboardingQuestionUpdateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/OnboardingUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/OnboardingUpdateChangeSet.cs
new file mode 100644
index 0000000000..09d1a9fdb3
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/OnboardingUpdateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating onboarding settings.
+/// </summary>
+public sealed class OnboardingUpdateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ServerGuideCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ServerGuideCreateChangeSet.cs
new file mode 100644
index 0000000000..c3972bd253
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ServerGuideCreateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for creating a server guide.
+/// </summary>
+public sealed class ServerGuideCreateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ServerGuideUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ServerGuideUpdateChangeSet.cs
new file mode 100644
index 0000000000..51ccda8b6b
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ServerGuideUpdateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating a server guide.
+/// </summary>
+public sealed class ServerGuideUpdateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/StageInstanceCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/StageInstanceCreateChangeSet.cs
new file mode 100644
index 0000000000..c26bbf0c4e
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/StageInstanceCreateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for creating a stage instance, making a stage channel live.
+/// </summary>
+public sealed class StageInstanceCreateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/StageInstanceDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/StageInstanceDeleteChangeSet.cs
new file mode 100644
index 0000000000..8ad2f80592
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/StageInstanceDeleteChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting a stage instance, ending a live stage channel.
+/// </summary>
+public sealed class StageInstanceDeleteChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/StageInstanceUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/StageInstanceUpdateChangeSet.cs
new file mode 100644
index 0000000000..b8dbf8ea3f
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/StageInstanceUpdateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating stage instance details.
+/// </summary>
+public sealed class StageInstanceUpdateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ThreadCreateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ThreadCreateChangeSet.cs
new file mode 100644
index 0000000000..16ee2cd54a
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ThreadCreateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for creating a thread in a channel.
+/// </summary>
+public sealed class ThreadCreateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ThreadDeleteChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ThreadDeleteChangeSet.cs
new file mode 100644
index 0000000000..92fc7353df
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ThreadDeleteChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for deleting a thread.
+/// </summary>
+public sealed class ThreadDeleteChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ThreadUpdateChangeSet.cs b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ThreadUpdateChangeSet.cs
new file mode 100644
index 0000000000..08323b4a14
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/ChangeSet/ThreadUpdateChangeSet.cs
@@ -0,0 +1,7 @@
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a change set for updating a thread.
+/// </summary>
+public sealed class ThreadUpdateChangeSet : DiscordAuditLogEntry
+{ }
diff --git a/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditEntryInfo.cs b/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditEntryInfo.cs
new file mode 100644
index 0000000000..a8649d1c45
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditEntryInfo.cs
@@ -0,0 +1,122 @@
+using DisCatSharp.Enums;
+
+using Newtonsoft.Json;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents additional information about the <see cref="DiscordAuditLogEntry"/>.
+/// </summary>
+public sealed class DiscordAuditEntryInfo : ObservableApiObject
+{
+	/// <summary>
+	/// Gets the guild in which the entities were targeted.
+	/// </summary>
+	[JsonIgnore]
+	internal DiscordGuild Guild
+		=> (this.Discord.Guilds.TryGetValue(this.GuildId, out var guild) ? guild : null!)!;
+
+	/// <summary>
+	/// Gets the ID of the guild in which the entities were targeted.
+	/// </summary>
+	[JsonIgnore]
+	internal ulong GuildId { get; set; }
+
+	/// <summary>
+	/// Gets the ID of the app whose permissions were targeted.
+	/// Event Type: <see cref="AuditLogActionType.ApplicationCommandPermissionUpdate"/>.
+	/// </summary>
+	[JsonProperty("application_id", NullValueHandling = NullValueHandling.Ignore)]
+	public ulong? ApplicationId { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the name of the Auto Moderation rule that was triggered.
+	/// Event Types: <see cref="AuditLogActionType.AutoModerationBlockMessage"/>, <see cref="AuditLogActionType.AutoModerationFlagToChannel"/>, <see cref="AuditLogActionType.AutoModerationUserCommunicationDisabled"/>
+	/// </summary>
+	[JsonProperty("auto_moderation_rule_name", NullValueHandling = NullValueHandling.Ignore)]
+	public string? AutoModerationRuleName { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the trigger type of the Auto Moderation rule that was triggered.
+	/// Event Types: <see cref="AuditLogActionType.AutoModerationBlockMessage"/>, <see cref="AuditLogActionType.AutoModerationFlagToChannel"/>, <see cref="AuditLogActionType.AutoModerationUserCommunicationDisabled"/>
+	/// </summary>
+	[JsonProperty("auto_moderation_rule_trigger_type", NullValueHandling = NullValueHandling.Ignore)]
+	public AutomodTriggerType? AutoModerationRuleTriggerType { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the ID of the channel in which the entities were targeted.
+	/// Event Types: <see cref="AuditLogActionType.MemberMove"/>, <see cref="AuditLogActionType.MessagePin"/>, <see cref="AuditLogActionType.MessageUnpin"/>, <see cref="AuditLogActionType.MessageDelete"/>, <see cref="AuditLogActionType.StageInstanceCreate"/>, <see cref="AuditLogActionType.StageInstanceUpdate"/>, <see cref="AuditLogActionType.StageInstanceDelete"/>, <see cref="AuditLogActionType.AutoModerationBlockMessage"/>, <see cref="AuditLogActionType.AutoModerationFlagToChannel"/>, <see cref="AuditLogActionType.AutoModerationUserCommunicationDisabled"/>
+	/// </summary>
+	[JsonProperty("channel_id", NullValueHandling = NullValueHandling.Ignore)]
+	public ulong? ChannelId { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the channel in which the entities were targeted.
+	/// </summary>
+	[JsonIgnore]
+	public DiscordChannel? Channel
+		=> this.ChannelId.HasValue ? this.Guild.GetChannel(this.ChannelId.Value) : null;
+
+	/// <summary>
+	/// Gets the number of entities that were targeted.
+	/// Event Types: <see cref="AuditLogActionType.MessageDelete"/>, <see cref="AuditLogActionType.MessageBulkDelete"/>, <see cref="AuditLogActionType.MemberDisconnect"/>, <see cref="AuditLogActionType.MemberMove"/>
+	/// </summary>
+	[JsonProperty("count", NullValueHandling = NullValueHandling.Ignore)]
+	public int? Count { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the number of days after which inactive members were kicked.
+	/// Event Type: <see cref="AuditLogActionType.MemberPrune"/>
+	/// </summary>
+	[JsonProperty("delete_member_days", NullValueHandling = NullValueHandling.Ignore)]
+	public int? DeleteMemberDays { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the ID of the overwritten entity.
+	/// Event Types: <see cref="AuditLogActionType.ChannelOverwriteCreate"/>, <see cref="AuditLogActionType.ChannelOverwriteUpdate"/>, <see cref="AuditLogActionType.ChannelOverwriteDelete"/>"/>
+	/// </summary>
+	[JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
+	public ulong? OverwrittenEntityId { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the number of members removed by the prune.
+	/// Event Type: <see cref="AuditLogActionType.MemberPrune"/>
+	/// </summary>
+	[JsonProperty("members_removed", NullValueHandling = NullValueHandling.Ignore)]
+	public int? MembersRemoved { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the ID of the message that was targeted.
+	/// Event Types: <see cref="AuditLogActionType.MessagePin"/>, <see cref="AuditLogActionType.MessageUnpin"/>
+	/// </summary>
+	[JsonProperty("message_id", NullValueHandling = NullValueHandling.Ignore)]
+	public ulong? MessageId { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the name of the role if the type is "0" (not present if the type is "1").
+	/// Event Types: <see cref="AuditLogActionType.ChannelOverwriteCreate"/>, <see cref="AuditLogActionType.ChannelOverwriteUpdate"/>, <see cref="AuditLogActionType.ChannelOverwriteDelete"/>
+	/// </summary>
+	[JsonProperty("role_name", NullValueHandling = NullValueHandling.Ignore)]
+	public string? RoleName { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the type of the overwritten entity - role ("0") or member ("1").
+	/// Event Types: <see cref="AuditLogActionType.ChannelOverwriteCreate"/>, <see cref="AuditLogActionType.ChannelOverwriteUpdate"/>, <see cref="AuditLogActionType.ChannelOverwriteDelete"/>
+	/// </summary>
+	[JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
+	public OverwriteType? OverwrittenEntityType { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the type of integration which performed the action.
+	/// Event Types: <see cref="AuditLogActionType.MemberKick"/>, <see cref="AuditLogActionType.MemberRoleUpdate"/>
+	/// </summary>
+	[JsonProperty("integration_type", NullValueHandling = NullValueHandling.Ignore)]
+	public string? IntegrationType { get; internal set; } = null;
+
+	/// <summary>
+	/// Gets the voice channel status.
+	/// Event Types: <see cref="AuditLogActionType.VoiceChannelStatusUpdate"/>
+	/// </summary>
+	[JsonProperty("status", NullValueHandling = NullValueHandling.Ignore)]
+	public string? Status { get; internal set; }
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditLog.cs b/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditLog.cs
new file mode 100644
index 0000000000..c58b2a9d13
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditLog.cs
@@ -0,0 +1,65 @@
+using System.Collections.Generic;
+
+using Newtonsoft.Json;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a Discord audit log.
+/// </summary>
+public sealed class DiscordAuditLog : ObservableApiObject
+{
+	/// <summary>
+	/// Gets or sets the ID of the guild in which the entities were targeted.
+	/// </summary>
+	[JsonIgnore]
+	internal ulong GuildId { get; set; }
+
+	/// <summary>
+	/// List of application commands referenced in the <see cref="DiscordAuditLog"/>.
+	/// </summary>
+	[JsonProperty("application_commands", NullValueHandling = NullValueHandling.Ignore)]
+	public List<DiscordApplicationCommand> ReferencedApplicationCommands { get; internal set; } = new();
+
+	/// <summary>
+	/// List of <see cref="DiscordAuditLogEntry"/>, sorted from most to least recent.
+	/// </summary>
+	[JsonProperty("audit_log_entries", NullValueHandling = NullValueHandling.Ignore)]
+	public List<DiscordAuditLogEntry> Entries { get; internal set; } = new();
+
+	/// <summary>
+	/// List of auto moderation rules referenced in the <see cref="DiscordAuditLog"/>.
+	/// </summary>
+	[JsonProperty("auto_moderation_rules", NullValueHandling = NullValueHandling.Ignore)]
+	public List<AutomodRule> ReferencedAutomodRules { get; internal set; } = new();
+
+	/// <summary>
+	/// List of guild scheduled events referenced in the <see cref="DiscordAuditLog"/>.
+	/// </summary>
+	[JsonProperty("guild_scheduled_events", NullValueHandling = NullValueHandling.Ignore)]
+	public List<DiscordScheduledEvent> ReferencedScheduledEvents { get; internal set; } = new();
+
+	/// <summary>
+	/// List of partial integration objects referenced in the <see cref="DiscordAuditLog"/>.
+	/// </summary>
+	[JsonProperty("integrations", NullValueHandling = NullValueHandling.Ignore)]
+	public List<DiscordIntegration> ReferencedIntegrations { get; internal set; } = new();
+
+	/// <summary>
+	/// List of threads referenced in the <see cref="DiscordAuditLog"/>.
+	/// </summary>
+	[JsonProperty("threads", NullValueHandling = NullValueHandling.Ignore)]
+	public List<DiscordThreadChannel> ReferencedThreads { get; internal set; } = new();
+
+	/// <summary>
+	/// List of users referenced in the <see cref="DiscordAuditLog"/>.
+	/// </summary>
+	[JsonProperty("users", NullValueHandling = NullValueHandling.Ignore)]
+	public List<DiscordUser> ReferencedUsers { get; internal set; } = new();
+
+	/// <summary>
+	/// List of webhooks referenced in the <see cref="DiscordAuditLog"/>.
+	/// </summary>
+	[JsonProperty("webhooks", NullValueHandling = NullValueHandling.Ignore)]
+	public List<DiscordWebhook> ReferencedWebhooks { get; internal set; } = new();
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditLogChangeObject.cs b/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditLogChangeObject.cs
new file mode 100644
index 0000000000..821c79fcb4
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditLogChangeObject.cs
@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+
+using Newtonsoft.Json;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a <see cref="DiscordAuditLogChangeObject"/> in a <see cref="DiscordAuditLogEntry"/>.
+/// </summary>
+public sealed class DiscordAuditLogChangeObject
+{
+	/// <summary>
+	/// Gets the new value of the change.
+	/// </summary>
+	[JsonProperty("new_value", NullValueHandling = NullValueHandling.Ignore)]
+	public object? NewValue { get; internal set; }
+
+	/// <summary>
+	/// Gets the old value of the change.
+	/// </summary>
+	[JsonProperty("old_value", NullValueHandling = NullValueHandling.Ignore)]
+	public object? OldValue { get; internal set; }
+
+	/// <summary>
+	/// Gets the key of the changed entity.
+	/// </summary>
+	[JsonProperty("key", NullValueHandling = NullValueHandling.Ignore)]
+	public string Key { get; internal set; }
+
+	[JsonIgnore]
+	public bool IsSpecialKey
+		=> SpecialChangeKeys.SpecialKeys.Contains(this.Key);
+}
+
+/// <summary>
+/// Represents special change keys for the <see cref="DiscordAuditLogChangeObject"/>.
+/// </summary>
+public static class SpecialChangeKeys
+{
+	/// <summary>
+	/// Special <see cref="DiscordAuditLogChangeObject.Key"/> for role add.
+	/// Contains a partial role object.
+	/// </summary>
+	public const string PARTIAL_ROLE_ADD = "$add";
+
+	/// <summary>
+	/// Special <see cref="DiscordAuditLogChangeObject.Key"/> for role remove.
+	/// Contains a partial role object.
+	/// </summary>
+	public const string PARTIAL_ROLE_REMOVE = "$remove";
+
+	/// <summary>
+	/// Special <see cref="DiscordAuditLogChangeObject.Key"/> for invite and invite metadata channel ids.
+	/// Uses <c>channel_id</c> instead of <c>channel</c>.<c>id</c>.
+	/// </summary>
+	public const string INVITE_CHANNEL_ID = "channel_id";
+
+	/// <summary>
+	/// Special <see cref="DiscordAuditLogChangeObject.Key"/> for webhook avatars.
+	/// Uses <c>avatar_hash</c> instead of <c>avatar</c>.
+	/// </summary>
+	public const string WEBHOOK_AVATAR = "avatar_hash";
+
+	public static readonly List<string> SpecialKeys = new()
+	{
+		PARTIAL_ROLE_ADD, PARTIAL_ROLE_REMOVE, INVITE_CHANNEL_ID, WEBHOOK_AVATAR
+	};
+}
diff --git a/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditLogEntry.cs b/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditLogEntry.cs
new file mode 100644
index 0000000000..0d95d018d8
--- /dev/null
+++ b/DisCatSharp/Entities/Guild/AuditLog/DiscordAuditLogEntry.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+
+using DisCatSharp.Enums;
+
+using Newtonsoft.Json;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a Discord audit log entry.
+/// </summary>
+public class DiscordAuditLogEntry : SnowflakeObject
+{
+	/// <summary>
+	/// Gets the client instance this object is tied to.
+	/// </summary>
+	[JsonIgnore]
+	internal new DiscordClient Discord { get; set; }
+
+	/// <summary>
+	/// Gets or sets the ID of the guild in which the entities were targeted.
+	/// </summary>
+	[JsonIgnore]
+	internal ulong GuildId { get; set; }
+
+	/// <summary>
+	/// Gets the ID of the affected entity (webhook, user, role, etc.).
+	/// </summary>
+	[JsonProperty("target_id", NullValueHandling = NullValueHandling.Ignore)]
+	public ulong? TargetId { get; internal set; }
+
+	/// <summary>
+	/// Gets the list of changes made to the target_id.
+	/// </summary>
+	[JsonProperty("changes", NullValueHandling = NullValueHandling.Ignore)]
+	public List<DiscordAuditLogChangeObject> Changes { get; internal set; } = new();
+
+	/// <summary>
+	/// Gets the ID of the user or app that made the changes.
+	/// </summary>
+	[JsonProperty("user_id", NullValueHandling = NullValueHandling.Ignore)]
+	public ulong? UserId { get; internal set; }
+
+	/// <summary>
+	/// Gets the user or app that made the changes.
+	/// </summary>
+	[JsonIgnore]
+	public DiscordUser? User
+		=> this.UserId.HasValue ? this.Discord.GetCachedOrEmptyUserInternal(this.UserId.Value) : null;
+
+	/// <summary>
+	/// Gets the type of action that occurred in the audit log entry.
+	/// </summary>
+	[JsonProperty("action_type", NullValueHandling = NullValueHandling.Ignore)]
+	public AuditLogActionType ActionType { get; internal set; }
+
+	/// <summary>
+	/// Gets additional information for certain event types.
+	/// </summary>
+	[JsonProperty("options", NullValueHandling = NullValueHandling.Ignore)]
+	public DiscordAuditEntryInfo? Options { get; internal set; }
+
+	/// <summary>
+	/// Gets the reason for the change (1-512 characters).
+	/// </summary>
+	[JsonProperty("reason", NullValueHandling = NullValueHandling.Ignore)]
+	public string? Reason { get; internal set; }
+
+	/// <summary>
+	/// Gets the change description.
+	/// </summary>
+	[JsonIgnore]
+	internal virtual string? ChangeDescription { get; set; } = null;
+
+	/// <summary>
+	/// Gets the valid action type for this change set.
+	/// </summary>
+	[JsonIgnore]
+	internal AuditLogActionType ValidFor { get; init; }
+
+	/// <inheritdoc />
+	public override string ToString()
+		=> /* this.ChangeDescription ?? temporary disabled */ $"{this.User} executed {this.ActionType}";
+
+	/// <summary>
+	/// Gets this <see cref="DiscordAuditLogEntry"/> as an easy to-use change set with the given type.
+	/// </summary>
+	/// <typeparam name="T">The type to convert to. Use the type based on the <see cref="ActionType"/>.</typeparam>
+	/// <returns>The easy to-use audit log entry.</returns>
+	/// <exception cref="InvalidCastException">Thrown when the <see cref="ActionType"/> is not compatible with the targets <see cref="ValidFor"/> type.</exception>
+	public T As<T>()
+		where T : DiscordAuditLogEntry, new()
+	{
+		if (this is T t)
+			return t.ValidFor == this.ActionType
+				? t
+				: throw new InvalidCastException($"Cannot convert {this.GetType().Name} with action type {this.ActionType} to {typeof(T).Name}.");
+
+		var target = new T
+		{
+			TargetId = this.TargetId,
+			Changes = this.Changes,
+			UserId = this.UserId,
+			ActionType = this.ActionType,
+			Options = this.Options,
+			Id = this.Id,
+			Discord = this.Discord,
+			Reason = this.Reason,
+			GuildId = this.GuildId
+		};
+
+		if (target.Options is not null)
+			target.Options.Discord = this.Discord;
+
+		return target.ValidFor == this.ActionType
+			? target
+			: throw new InvalidCastException($"Cannot convert {this.GetType().Name} with action type {this.ActionType} to {typeof(T).Name}.");
+	}
+
+	/// <summary>
+	/// Converts an object to ulong?.
+	/// </summary>
+	/// <param name="obj">The object to convert.</param>
+	internal static ulong? ConvertToUlong(object? obj)
+	{
+		var str = obj?.ToString();
+		return str == null
+			? null
+			: ulong.TryParse(str, out var val)
+				? val
+				: null;
+	}
+}
diff --git a/DisCatSharp/Entities/Guild/Automod/AutomodRule.cs b/DisCatSharp/Entities/Guild/Automod/AutomodRule.cs
index 7457f1b172..8759b0f7ec 100644
--- a/DisCatSharp/Entities/Guild/Automod/AutomodRule.cs
+++ b/DisCatSharp/Entities/Guild/Automod/AutomodRule.cs
@@ -107,6 +107,7 @@ public async Task<AutomodRule> ModifyAsync(Action<AutomodRuleEditModel> action)
 			if (mdl.TriggerMetadata.Value.MentionRaidProtectionEnabled != null && this.TriggerType != AutomodTriggerType.MentionSpam)
 				throw new ArgumentException($"Cannot use MentionRaidProtectionEnabled for a {this.TriggerType} rule. Only {AutomodTriggerType.MentionSpam} is valid in this context.");
 		}
+
 		return await this.Discord.ApiClient.ModifyAutomodRuleAsync(this.GuildId, this.Id, mdl.Name, mdl.EventType, mdl.TriggerMetadata, mdl.Actions, mdl.Enabled, mdl.ExemptRoles, mdl.ExemptChannels, mdl.AuditLogReason).ConfigureAwait(false);
 	}
 
diff --git a/DisCatSharp/Entities/Guild/DiscordAuditLogObjects.cs b/DisCatSharp/Entities/Guild/DiscordAuditLogObjects.cs
deleted file mode 100644
index 89cda0ffb6..0000000000
--- a/DisCatSharp/Entities/Guild/DiscordAuditLogObjects.cs
+++ /dev/null
@@ -1,831 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using DisCatSharp.Enums;
-
-namespace DisCatSharp.Entities;
-
-/// <summary>
-/// Represents an audit log entry.
-/// </summary>
-public abstract class DiscordAuditLogEntry : SnowflakeObject
-{
-	/// <summary>
-	/// Gets the entry's action type.
-	/// </summary>
-	public AuditLogActionType ActionType { get; internal set; }
-
-	/// <summary>
-	/// Gets the user responsible for the action.
-	/// </summary>
-	public DiscordUser UserResponsible { get; internal set; }
-
-	/// <summary>
-	/// Gets the reason defined in the action.
-	/// </summary>
-	public string Reason { get; internal set; }
-
-	/// <summary>
-	/// Gets the category under which the action falls.
-	/// </summary>
-	public AuditLogActionCategory ActionCategory { get; internal set; }
-}
-
-/// <summary>
-/// Represents a description of how a property changed.
-/// </summary>
-/// <typeparam name="T">Type of the changed property.</typeparam>
-public sealed class PropertyChange<T>
-{
-	/// <summary>
-	/// The property's value before it was changed.
-	/// </summary>
-	public T Before { get; internal set; }
-
-	/// <summary>
-	/// The property's value after it was changed.
-	/// </summary>
-	public T After { get; internal set; }
-}
-
-/// <summary>
-/// Represents a audit log guild entry.
-/// </summary>
-public sealed class DiscordAuditLogGuildEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected guild.
-	/// </summary>
-	public DiscordGuild Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the name change.
-	/// </summary>
-	public PropertyChange<string> NameChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the owner change.
-	/// </summary>
-	public PropertyChange<DiscordMember> OwnerChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the icon change.
-	/// </summary>
-	public PropertyChange<string> IconChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the verification level change.
-	/// </summary>
-	public PropertyChange<VerificationLevel> VerificationLevelChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the afk channel change.
-	/// </summary>
-	public PropertyChange<DiscordChannel> AfkChannelChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the system channel flags change.
-	/// </summary>
-	public PropertyChange<SystemChannelFlags> SystemChannelFlagsChange { get; internal set; }
-
-	/// <summary>
-	/// <see cref="DiscordGuild.WidgetChannel"/>
-	/// </summary>
-	public PropertyChange<DiscordChannel> WidgetChannelChange { get; internal set; }
-
-	/// <summary>
-	/// <see cref="DiscordGuild.RulesChannel"/>
-	/// </summary>
-	public PropertyChange<DiscordChannel> RulesChannelChange { get; internal set; }
-
-	/// <summary>
-	/// <see cref="DiscordGuild.PublicUpdatesChannel"/>
-	/// </summary>
-	public PropertyChange<DiscordChannel> PublicUpdatesChannelChange { get; internal set; }
-
-	/// <summary>
-	/// <see cref="DiscordGuild.DefaultMessageNotifications"/>
-	/// </summary>
-	public PropertyChange<DefaultMessageNotifications> NotificationSettingsChange { get; internal set; }
-
-	/// <summary>
-	/// <see cref="DiscordGuild.SystemChannel"/>
-	/// </summary>
-	public PropertyChange<DiscordChannel> SystemChannelChange { get; internal set; }
-
-	/// <summary>
-	/// <see cref="DiscordGuild.ExplicitContentFilter"/>
-	/// </summary>
-	public PropertyChange<ExplicitContentFilter> ExplicitContentFilterChange { get; internal set; }
-
-	/// <summary>
-	/// <see cref="DiscordGuild.MfaLevel"/>
-	/// </summary>
-	public PropertyChange<MfaLevel> MfaLevelChange { get; internal set; }
-
-	/// <summary>
-	/// <see cref="DiscordGuild.SplashUrl"/>
-	/// </summary>
-	public PropertyChange<string> SplashChange { get; internal set; }
-
-	/// <summary>
-	/// <see cref="DiscordGuild.VoiceRegion"/>
-	/// </summary>
-	public PropertyChange<string> RegionChange { get; internal set; }
-
-	/// <summary>
-	/// <see cref="DiscordGuild.VanityUrlCode"/>
-	/// </summary>
-	public PropertyChange<string> VanityUrlCodeChange { get; internal set; }
-
-	/// <summary>
-	/// <see cref="DiscordGuild.PremiumProgressBarEnabled"/>
-	/// </summary>
-	public PropertyChange<bool> PremiumProgressBarChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogGuildEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogGuildEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log channel entry.
-/// </summary>
-public sealed class DiscordAuditLogChannelEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected channel.
-	/// </summary>
-	public DiscordChannel Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of channel's name change.
-	/// </summary>
-	public PropertyChange<string> NameChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of channel's type change.
-	/// </summary>
-	public PropertyChange<ChannelType?> TypeChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of channel's nsfw flag change.
-	/// </summary>
-	public PropertyChange<bool?> NsfwChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the rtc region id change.
-	/// </summary>
-	public PropertyChange<string> RtcRegionIdChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of channel's bitrate change.
-	/// </summary>
-	public PropertyChange<int?> BitrateChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of channel permission overwrites' change.
-	/// </summary>
-	public PropertyChange<IReadOnlyList<DiscordOverwrite>> OverwriteChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of channel's topic change.
-	/// </summary>
-	public PropertyChange<string> TopicChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the user limit change.
-	/// </summary>
-	public PropertyChange<int?> UserLimitChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of channel's slow mode timeout change.
-	/// </summary>
-	public PropertyChange<int?> PerUserRateLimitChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the channel flags change.
-	/// </summary>
-	public PropertyChange<ChannelFlags> ChannelFlagsChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the default auto archive duration change.
-	/// </summary>
-	public PropertyChange<ThreadAutoArchiveDuration?> DefaultAutoArchiveDurationChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the default available tags change.
-	/// </summary>
-	public PropertyChange<List<ForumPostTag>> AvailableTagsChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogChannelEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogChannelEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log overwrite entry.
-/// </summary>
-public sealed class DiscordAuditLogOverwriteEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected overwrite.
-	/// </summary>
-	public DiscordOverwrite Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the channel for which the overwrite was changed.
-	/// </summary>
-	public DiscordChannel Channel { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of overwrite's allow value change.
-	/// </summary>
-	public PropertyChange<Permissions?> AllowChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of overwrite's deny value change.
-	/// </summary>
-	public PropertyChange<Permissions?> DenyChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of overwrite's type change.
-	/// </summary>
-	public PropertyChange<OverwriteType?> TypeChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of overwrite's target id change.
-	/// </summary>
-	public PropertyChange<ulong?> TargetIdChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogOverwriteEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogOverwriteEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log kick entry.
-/// </summary>
-public sealed class DiscordAuditLogKickEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the kicked member.
-	/// </summary>
-	public DiscordMember Target { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogKickEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogKickEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log prune entry.
-/// </summary>
-public sealed class DiscordAuditLogPruneEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the number inactivity days after which members were pruned.
-	/// </summary>
-	public int Days { get; internal set; }
-
-	/// <summary>
-	/// Gets the number of members pruned.
-	/// </summary>
-	public int Toll { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogPruneEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogPruneEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log ban entry.
-/// </summary>
-public sealed class DiscordAuditLogBanEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the banned member.
-	/// </summary>
-	public DiscordMember Target { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogBanEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogBanEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log member update entry.
-/// </summary>
-public sealed class DiscordAuditLogMemberUpdateEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected member.
-	/// </summary>
-	public DiscordMember Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of member's nickname change.
-	/// </summary>
-	public PropertyChange<string> NicknameChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the roles that were removed from the member.
-	/// </summary>
-	public IReadOnlyList<DiscordRole> RemovedRoles { get; internal set; }
-
-	/// <summary>
-	/// Gets the roles that were added to the member.
-	/// </summary>
-	public IReadOnlyList<DiscordRole> AddedRoles { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of member's mute status change.
-	/// </summary>
-	public PropertyChange<bool?> MuteChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of member's deaf status change.
-	/// </summary>
-	public PropertyChange<bool?> DeafenChange { get; internal set; }
-
-	/// <summary>
-	/// Get's the timeout change.
-	/// </summary>
-	public PropertyChange<DateTime?> CommunicationDisabledUntilChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogMemberUpdateEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogMemberUpdateEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log role update entry.
-/// </summary>
-public sealed class DiscordAuditLogRoleUpdateEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected role.
-	/// </summary>
-	public DiscordRole Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of role's name change.
-	/// </summary>
-	public PropertyChange<string> NameChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of role's color change.
-	/// </summary>
-	public PropertyChange<int?> ColorChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of role's permission set change.
-	/// </summary>
-	public PropertyChange<Permissions?> PermissionChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of the role's position change.
-	/// </summary>
-	public PropertyChange<int?> PositionChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of the role's mentionability change.
-	/// </summary>
-	public PropertyChange<bool?> MentionableChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of the role's hoist status change.
-	/// </summary>
-	public PropertyChange<bool?> HoistChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the role icon hash change.
-	/// </summary>
-	public PropertyChange<string> IconHashChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogRoleUpdateEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogRoleUpdateEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log invite entry.
-/// </summary>
-public sealed class DiscordAuditLogInviteEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected invite.
-	/// </summary>
-	public DiscordInvite Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of invite's max age change.
-	/// </summary>
-	public PropertyChange<int?> MaxAgeChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of invite's code change.
-	/// </summary>
-	public PropertyChange<string> CodeChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of invite's temporariness change.
-	/// </summary>
-	public PropertyChange<bool?> TemporaryChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of invite's inviting member change.
-	/// </summary>
-	public PropertyChange<DiscordMember> InviterChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of invite's target channel change.
-	/// </summary>
-	public PropertyChange<DiscordChannel> ChannelChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of invite's use count change.
-	/// </summary>
-	public PropertyChange<int?> UsesChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of invite's max use count change.
-	/// </summary>
-	public PropertyChange<int?> MaxUsesChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogInviteEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogInviteEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log webhook entry.
-/// </summary>
-public sealed class DiscordAuditLogWebhookEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected webhook.
-	/// </summary>
-	public DiscordWebhook Target { get; internal set; }
-
-	/// <summary>
-	/// Undocumented.
-	/// </summary>
-	public PropertyChange<ulong?> IdChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of webhook's name change.
-	/// </summary>
-	public PropertyChange<string> NameChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of webhook's target channel change.
-	/// </summary>
-	public PropertyChange<DiscordChannel> ChannelChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of webhook's type change.
-	/// </summary>
-	public PropertyChange<int?> TypeChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of webhook's avatar change.
-	/// </summary>
-	public PropertyChange<string> AvatarHashChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogWebhookEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogWebhookEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log emoji entry.
-/// </summary>
-public sealed class DiscordAuditLogEmojiEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected emoji.
-	/// </summary>
-	public DiscordEmoji Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of emoji's name change.
-	/// </summary>
-	public PropertyChange<string> NameChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogEmojiEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogEmojiEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log sticker entry.
-/// </summary>
-public sealed class DiscordAuditLogStickerEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected sticker.
-	/// </summary>
-	public DiscordSticker Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of sticker's name change.
-	/// </summary>
-	public PropertyChange<string> NameChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of sticker's description change.
-	/// </summary>
-	public PropertyChange<string> DescriptionChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of sticker's tags change.
-	/// </summary>
-	public PropertyChange<string> TagsChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of sticker's tags change.
-	/// </summary>
-	public PropertyChange<string> AssetChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of sticker's guild id change.
-	/// </summary>
-	public PropertyChange<ulong?> GuildIdChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of sticker's availability change.
-	/// </summary>
-	public PropertyChange<bool?> AvailabilityChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of sticker's id change.
-	/// </summary>
-	public PropertyChange<ulong?> IdChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of sticker's type change.
-	/// </summary>
-	public PropertyChange<StickerType?> TypeChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of sticker's format change.
-	/// </summary>
-	public PropertyChange<StickerFormat?> FormatChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogStickerEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogStickerEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log message entry.
-/// </summary>
-public sealed class DiscordAuditLogMessageEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected message. Note that more often than not, this will only have ID specified.
-	/// </summary>
-	public DiscordMessage Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the channel in which the action occurred.
-	/// </summary>
-	public DiscordChannel Channel { get; internal set; }
-
-	/// <summary>
-	/// Gets the number of messages that were affected.
-	/// </summary>
-	public int? MessageCount { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogMessageEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogMessageEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log message pin entry.
-/// </summary>
-public sealed class DiscordAuditLogMessagePinEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected message's user.
-	/// </summary>
-	public DiscordUser Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the channel the message is in.
-	/// </summary>
-	public DiscordChannel Channel { get; internal set; }
-
-	/// <summary>
-	/// Gets the message the pin action was for.
-	/// </summary>
-	public DiscordMessage Message { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogMessagePinEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogMessagePinEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log bot add entry.
-/// </summary>
-public sealed class DiscordAuditLogBotAddEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the bot that has been added to the guild.
-	/// </summary>
-	public DiscordUser TargetBot { get; internal set; }
-}
-
-/// <summary>
-/// Represents a audit log member move entry.
-/// </summary>
-public sealed class DiscordAuditLogMemberMoveEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the channel the members were moved in.
-	/// </summary>
-	public DiscordChannel Channel { get; internal set; }
-
-	/// <summary>
-	/// Gets the amount of users that were moved out from the voice channel.
-	/// </summary>
-	public int UserCount { get; internal set; }
-}
-
-/// <summary>
-/// Represents a audit log member disconnect entry.
-/// </summary>
-public sealed class DiscordAuditLogMemberDisconnectEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the amount of users that were disconnected from the voice channel.
-	/// </summary>
-	public int UserCount { get; internal set; }
-}
-
-/// <summary>
-/// Represents a audit log integration entry.
-/// </summary>
-public sealed class DiscordAuditLogIntegrationEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// The type of integration.
-	/// </summary>
-	public PropertyChange<string> Type { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of emoticons' change.
-	/// </summary>
-	public PropertyChange<bool?> EnableEmoticons { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of expire grace period's change.
-	/// </summary>
-	public PropertyChange<int?> ExpireGracePeriod { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of expire behavior change.
-	/// </summary>
-	public PropertyChange<int?> ExpireBehavior { get; internal set; }
-}
-
-/// <summary>
-/// Represents a audit log stage entry.
-/// </summary>
-public sealed class DiscordAuditLogStageEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected stage instance
-	/// </summary>
-	public DiscordStageInstance Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the description of stage instance's topic change.
-	/// </summary>
-	public PropertyChange<string> TopicChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogStageEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogStageEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log event entry.
-/// </summary>
-public sealed class DiscordAuditLogGuildScheduledEventEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected event
-	/// </summary>
-	public DiscordScheduledEvent Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the channel change.
-	/// </summary>
-	public PropertyChange<ulong?> ChannelIdChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the name change.
-	/// </summary>
-	public PropertyChange<string> NameChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the description change.
-	/// </summary>
-	public PropertyChange<string> DescriptionChange { get; internal set; }
-
-	/* Will be added https://github.com/discord/discord-api-docs/pull/3586#issuecomment-969137241
-        public PropertyChange<> ScheduledStartTimeChange { get; internal set; }
-
-        public PropertyChange<> ScheduledEndTimeChange { get; internal set; }
-        */
-
-	/// <summary>
-	/// Gets the location change.
-	/// </summary>
-	public PropertyChange<string> LocationChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the status change.
-	/// </summary>
-	public PropertyChange<ScheduledEventStatus?> StatusChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the entity type change.
-	/// </summary>
-	public PropertyChange<ScheduledEventEntityType?> EntityTypeChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogGuildScheduledEventEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogGuildScheduledEventEntry() { }
-}
-
-/// <summary>
-/// Represents a audit log thread entry.
-/// </summary>
-public sealed class DiscordAuditLogThreadEntry : DiscordAuditLogEntry
-{
-	/// <summary>
-	/// Gets the affected thread
-	/// </summary>
-	public DiscordThreadChannel Target { get; internal set; }
-
-	/// <summary>
-	/// Gets the name of the thread.
-	/// </summary>
-	public PropertyChange<string> NameChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the type of the thread.
-	/// </summary>
-	public PropertyChange<ChannelType?> TypeChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the archived state of the thread.
-	/// </summary>
-	public PropertyChange<bool?> ArchivedChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the locked state of the thread.
-	/// </summary>
-	public PropertyChange<bool?> LockedChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the invitable state of the thread.
-	/// </summary>
-	public PropertyChange<bool?> InvitableChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the new auto archive duration of the thread.
-	/// </summary>
-	public PropertyChange<ThreadAutoArchiveDuration?> AutoArchiveDurationChange { get; internal set; }
-
-	/// <summary>
-	/// Gets the new ratelimit of the thread.
-	/// </summary>
-	public PropertyChange<int?> PerUserRateLimitChange { get; internal set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="DiscordAuditLogThreadEntry"/> class.
-	/// </summary>
-	internal DiscordAuditLogThreadEntry() { }
-}
diff --git a/DisCatSharp/Entities/Guild/DiscordGuild.AuditLog.cs b/DisCatSharp/Entities/Guild/DiscordGuild.AuditLog.cs
deleted file mode 100644
index e3c780d3fd..0000000000
--- a/DisCatSharp/Entities/Guild/DiscordGuild.AuditLog.cs
+++ /dev/null
@@ -1,1351 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
-
-using DisCatSharp.Enums;
-using DisCatSharp.Exceptions;
-using DisCatSharp.Net;
-using DisCatSharp.Net.Abstractions;
-
-using Microsoft.Extensions.Logging;
-
-using Newtonsoft.Json.Linq;
-
-namespace DisCatSharp.Entities;
-
-public partial class DiscordGuild
-{
-	// TODO: Rework audit logs!
-
-	/// <summary>
-	/// Gets audit log entries for this guild.
-	/// </summary>
-	/// <param name="limit">Maximum number of entries to fetch.</param>
-	/// <param name="byMember">Filter by member responsible.</param>
-	/// <param name="actionType">Filter by action type.</param>
-	/// <returns>A collection of requested audit log entries.</returns>
-	/// <exception cref="UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ViewAuditLog"/> permission.</exception>
-	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
-	public async Task<IReadOnlyList<DiscordAuditLogEntry>> GetAuditLogsAsync(int? limit = null, DiscordMember byMember = null, AuditLogActionType? actionType = null)
-	{
-		var alrs = new List<AuditLog>();
-		int ac = 1, tc = 0, rmn = 100;
-		var last = 0ul;
-		while (ac > 0)
-		{
-			rmn = limit != null ? limit.Value - tc : 100;
-			rmn = Math.Min(100, rmn);
-			if (rmn <= 0) break;
-
-			var alr = await this.Discord.ApiClient.GetAuditLogsAsync(this.Id, rmn, null, last == 0 ? null : last, byMember?.Id, (int?)actionType).ConfigureAwait(false);
-			ac = alr.Entries.Count;
-			tc += ac;
-			if (ac > 0)
-			{
-				last = alr.Entries[alr.Entries.Count - 1].Id;
-				alrs.Add(alr);
-			}
-		}
-
-		var auditLogResult = await this.ProcessAuditLog(alrs).ConfigureAwait(false);
-		return auditLogResult;
-	}
-
-	/// <summary>
-	/// Proceesses audit log objects.
-	/// </summary>
-	/// <param name="auditLogApiResult">A list of raw audit log objects.</param>
-	/// <returns>The processed audit log list as readonly.</returns>
-	internal async Task<IReadOnlyList<DiscordAuditLogEntry>> ProcessAuditLog(List<AuditLog> auditLogApiResult)
-	{
-		List<AuditLogUser> amr = new();
-		if (auditLogApiResult.Any(ar => ar.Users != null && ar.Users.Any()))
-			amr = auditLogApiResult.SelectMany(xa => xa.Users)
-				.GroupBy(xu => xu.Id)
-				.Select(xgu => xgu.First()).ToList();
-
-		if (amr.Any())
-			foreach (var xau in amr)
-			{
-				if (this.Discord.UserCache.ContainsKey(xau.Id))
-					continue;
-
-				var xtu = new TransportUser
-				{
-					Id = xau.Id,
-					Username = xau.Username,
-					Discriminator = xau.Discriminator,
-					AvatarHash = xau.AvatarHash
-				};
-				var xu = new DiscordUser(xtu) { Discord = this.Discord };
-				xu = this.Discord.UserCache.AddOrUpdate(xu.Id, xu, (id, old) =>
-				{
-					old.Username = xu.Username;
-					old.Discriminator = xu.Discriminator;
-					old.AvatarHash = xu.AvatarHash;
-					old.GlobalName = xu.GlobalName;
-					return old;
-				});
-			}
-
-		List<AuditLogGuildScheduledEvent> atgse = new();
-		if (auditLogApiResult.Any(ar => ar.ScheduledEvents != null && ar.ScheduledEvents.Any()))
-			atgse = auditLogApiResult.SelectMany(xa => xa.ScheduledEvents)
-				.GroupBy(xse => xse.Id)
-				.Select(xgse => xgse.First()).ToList();
-
-		List<AuditLogThread> ath = new();
-		if (auditLogApiResult.Any(ar => ar.Threads != null && ar.Threads.Any()))
-			ath = auditLogApiResult.SelectMany(xa => xa.Threads)
-				.GroupBy(xt => xt.Id)
-				.Select(xgt => xgt.First()).ToList();
-
-		List<AuditLogIntegration> aig = new();
-		if (auditLogApiResult.Any(ar => ar.Integrations != null && ar.Integrations.Any()))
-			aig = auditLogApiResult.SelectMany(xa => xa.Integrations)
-				.GroupBy(xi => xi.Id)
-				.Select(xgi => xgi.First()).ToList();
-
-		List<AuditLogWebhook> ahr = new();
-		if (auditLogApiResult.Any(ar => ar.Webhooks != null && ar.Webhooks.Any()))
-			ahr = auditLogApiResult.SelectMany(xa => xa.Webhooks)
-				.GroupBy(xh => xh.Id)
-				.Select(xgh => xgh.First()).ToList();
-
-		List<DiscordMember> ams = new();
-		Dictionary<ulong, DiscordMember> amd = new();
-		if (amr.Any())
-			ams = amr.Select(xau => this.MembersInternal != null && this.MembersInternal.TryGetValue(xau.Id, out var member) ? member : new() { Discord = this.Discord, Id = xau.Id, GuildId = this.Id }).ToList();
-		if (ams.Any())
-			amd = ams.ToDictionary(xm => xm.Id, xm => xm);
-
-#pragma warning disable CS0219
-		Dictionary<ulong, DiscordThreadChannel> dtc = null;
-		Dictionary<ulong, DiscordIntegration> di = null;
-		Dictionary<ulong, DiscordScheduledEvent> dse = null;
-#pragma warning restore
-
-		Dictionary<ulong, DiscordWebhook> ahd = null;
-		if (ahr.Any())
-		{
-			var whr = await this.GetWebhooksAsync().ConfigureAwait(false);
-			var whs = whr.ToDictionary(xh => xh.Id, xh => xh);
-
-			var amh = ahr.Select(xah => whs.TryGetValue(xah.Id, out var webhook) ? webhook : new() { Discord = this.Discord, Name = xah.Name, Id = xah.Id, AvatarHash = xah.AvatarHash, ChannelId = xah.ChannelId, GuildId = xah.GuildId, Token = xah.Token });
-			ahd = amh.ToDictionary(xh => xh.Id, xh => xh);
-		}
-
-		var acs = auditLogApiResult.SelectMany(xa => xa.Entries).OrderByDescending(xa => xa.Id);
-		var entries = new List<DiscordAuditLogEntry>();
-		foreach (var xac in acs)
-		{
-			DiscordAuditLogEntry entry = null;
-			ulong t1, t2;
-			int t3, t4;
-			long t5, t6;
-			bool p1, p2;
-			switch (xac.ActionType)
-			{
-				case AuditLogActionType.Invalid:
-					break;
-
-				case AuditLogActionType.GuildUpdate:
-					entry = new DiscordAuditLogGuildEntry
-					{
-						Target = this
-					};
-
-					var entrygld = entry as DiscordAuditLogGuildEntry;
-					foreach (var xc in xac.Changes)
-					{
-						PropertyChange<DiscordChannel> GetChannelChange()
-						{
-							ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
-							ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
-
-							return new()
-							{
-								Before = this.GetChannel(t1) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id },
-								After = this.GetChannel(t2) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id }
-							};
-						}
-
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "name":
-								entrygld.NameChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "owner_id":
-								entrygld.OwnerChange = new()
-								{
-									Before = this.MembersInternal != null && this.MembersInternal.TryGetValue(xc.OldValueUlong, out var oldMember) ? oldMember : await this.GetMemberAsync(xc.OldValueUlong).ConfigureAwait(false),
-									After = this.MembersInternal != null && this.MembersInternal.TryGetValue(xc.NewValueUlong, out var newMember) ? newMember : await this.GetMemberAsync(xc.NewValueUlong).ConfigureAwait(false)
-								};
-								break;
-
-							case "icon_hash":
-								entrygld.IconChange = new()
-								{
-									Before = xc.OldValueString != null ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.ICONS}/{this.Id}/{xc.OldValueString}.webp" : null,
-									After = xc.OldValueString != null ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.ICONS}/{this.Id}/{xc.NewValueString}.webp" : null
-								};
-								break;
-
-							case "verification_level":
-								entrygld.VerificationLevelChange = new()
-								{
-									Before = (VerificationLevel)(long)xc.OldValue,
-									After = (VerificationLevel)(long)xc.NewValue
-								};
-								break;
-
-							case "afk_channel_id":
-								entrygld.AfkChannelChange = GetChannelChange();
-								break;
-
-							case "system_channel_flags":
-								entrygld.SystemChannelFlagsChange = new()
-								{
-									Before = (SystemChannelFlags)(long)xc.OldValue,
-									After = (SystemChannelFlags)(long)xc.NewValue
-								};
-								break;
-
-							case "widget_channel_id":
-								entrygld.WidgetChannelChange = GetChannelChange();
-								break;
-
-							case "rules_channel_id":
-								entrygld.RulesChannelChange = GetChannelChange();
-								break;
-
-							case "public_updates_channel_id":
-								entrygld.PublicUpdatesChannelChange = GetChannelChange();
-								break;
-
-							case "splash_hash":
-								entrygld.SplashChange = new()
-								{
-									Before = xc.OldValueString != null ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.SPLASHES}/{this.Id}/{xc.OldValueString}.webp?size=2048" : null,
-									After = xc.NewValueString != null ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.SPLASHES}/{this.Id}/{xc.NewValueString}.webp?size=2048" : null
-								};
-								break;
-
-							case "default_message_notifications":
-								entrygld.NotificationSettingsChange = new()
-								{
-									Before = (DefaultMessageNotifications)(long)xc.OldValue,
-									After = (DefaultMessageNotifications)(long)xc.NewValue
-								};
-								break;
-
-							case "system_channel_id":
-								entrygld.SystemChannelChange = GetChannelChange();
-								break;
-
-							case "explicit_content_filter":
-								entrygld.ExplicitContentFilterChange = new()
-								{
-									Before = (ExplicitContentFilter)(long)xc.OldValue,
-									After = (ExplicitContentFilter)(long)xc.NewValue
-								};
-								break;
-
-							case "mfa_level":
-								entrygld.MfaLevelChange = new()
-								{
-									Before = (MfaLevel)(long)xc.OldValue,
-									After = (MfaLevel)(long)xc.NewValue
-								};
-								break;
-
-							case "region":
-								entrygld.RegionChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "vanity_url_code":
-								entrygld.VanityUrlCodeChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "premium_progress_bar_enabled":
-								entrygld.PremiumProgressBarChange = new()
-								{
-									Before = (bool)xc.OldValue,
-									After = (bool)xc.NewValue
-								};
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in guild update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-				case AuditLogActionType.ChannelCreate:
-				case AuditLogActionType.ChannelDelete:
-				case AuditLogActionType.ChannelUpdate:
-					entry = new DiscordAuditLogChannelEntry
-					{
-						Target = this.GetChannel(xac.TargetId.Value) ?? new DiscordChannel { Id = xac.TargetId.Value, Discord = this.Discord, GuildId = this.Id }
-					};
-
-					var entrychn = entry as DiscordAuditLogChannelEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "name":
-								entrychn.NameChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "type":
-								p1 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
-								p2 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
-
-								entrychn.TypeChange = new()
-								{
-									Before = p1 ? (ChannelType?)t1 : null,
-									After = p2 ? (ChannelType?)t2 : null
-								};
-								break;
-
-							case "flags":
-								entrychn.ChannelFlagsChange = new()
-								{
-									Before = (ChannelFlags)(long)(xc.OldValue ?? 0L),
-									After = (ChannelFlags)(long)(xc.NewValue ?? 0L)
-								};
-								break;
-
-							case "permission_overwrites":
-								var olds = xc.OldValues?.OfType<JObject>()
-									?.Select(xjo => xjo.ToObject<DiscordOverwrite>())
-									?.Select(xo => { xo.Discord = this.Discord; return xo; });
-
-								var news = xc.NewValues?.OfType<JObject>()
-									?.Select(xjo => xjo.ToObject<DiscordOverwrite>())
-									?.Select(xo => { xo.Discord = this.Discord; return xo; });
-
-								entrychn.OverwriteChange = new()
-								{
-									Before = olds != null ? new ReadOnlyCollection<DiscordOverwrite>(new List<DiscordOverwrite>(olds)) : null,
-									After = news != null ? new ReadOnlyCollection<DiscordOverwrite>(new List<DiscordOverwrite>(news)) : null
-								};
-								break;
-
-							case "topic":
-								entrychn.TopicChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "nsfw":
-								entrychn.NsfwChange = new()
-								{
-									Before = (bool?)xc.OldValue,
-									After = (bool?)xc.NewValue
-								};
-								break;
-
-							case "rtc_region":
-								entrychn.RtcRegionIdChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "bitrate":
-								entrychn.BitrateChange = new()
-								{
-									Before = (int?)(long?)xc.OldValue,
-									After = (int?)(long?)xc.NewValue
-								};
-								break;
-
-							case "user_limit":
-								entrychn.UserLimitChange = new()
-								{
-									Before = (int?)(long?)xc.OldValue,
-									After = (int?)(long?)xc.NewValue
-								};
-								break;
-
-							case "rate_limit_per_user":
-								entrychn.PerUserRateLimitChange = new()
-								{
-									Before = (int?)(long?)xc.OldValue,
-									After = (int?)(long?)xc.NewValue
-								};
-								break;
-
-							case "default_auto_archive_duration":
-								entrychn.DefaultAutoArchiveDurationChange = new()
-								{
-									Before = (ThreadAutoArchiveDuration?)(long?)xc.OldValue,
-									After = (ThreadAutoArchiveDuration?)(long?)xc.NewValue
-								};
-								break;
-							case "available_tags":
-								var oldTags = xc.OldValues?.OfType<JObject>()
-									?.Select(xjo => xjo.ToObject<ForumPostTag>())
-									?.Select(xo => { xo.Discord = this.Discord; return xo; });
-
-								var newTags = xc.NewValues?.OfType<JObject>()
-									?.Select(xjo => xjo.ToObject<ForumPostTag>())
-									?.Select(xo => { xo.Discord = this.Discord; return xo; });
-
-								entrychn.AvailableTagsChange = new()
-								{
-									Before = oldTags != null ? new List<ForumPostTag>(new List<ForumPostTag>(oldTags)) : null,
-									After = newTags != null ? new List<ForumPostTag>(new List<ForumPostTag>(newTags)) : null
-								};
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in channel update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-				case AuditLogActionType.OverwriteCreate:
-				case AuditLogActionType.OverwriteDelete:
-				case AuditLogActionType.OverwriteUpdate:
-					entry = new DiscordAuditLogOverwriteEntry
-					{
-						Target = this.GetChannel(xac.TargetId.Value)?.PermissionOverwrites.FirstOrDefault(xo => xo.Id == xac.Options.Id),
-						Channel = this.GetChannel(xac.TargetId.Value)
-					};
-
-					var entryovr = entry as DiscordAuditLogOverwriteEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "deny":
-								p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
-								p2 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
-
-								entryovr.DenyChange = new()
-								{
-									Before = p1 ? (Permissions?)t1 : null,
-									After = p2 ? (Permissions?)t2 : null
-								};
-								break;
-
-							case "allow":
-								p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
-								p2 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
-
-								entryovr.AllowChange = new()
-								{
-									Before = p1 ? (Permissions?)t1 : null,
-									After = p2 ? (Permissions?)t2 : null
-								};
-								break;
-
-							case "type":
-								entryovr.TypeChange = new()
-								{
-									Before = xc.OldValue != null ? (OverwriteType)(long)xc.OldValue : null,
-									After = xc.NewValue != null ? (OverwriteType)(long)xc.NewValue : null
-								};
-								break;
-
-							case "id":
-								p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
-								p2 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
-
-								entryovr.TargetIdChange = new()
-								{
-									Before = p1 ? t1 : null,
-									After = p2 ? t2 : null
-								};
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in overwrite update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-				case AuditLogActionType.Kick:
-					entry = new DiscordAuditLogKickEntry
-					{
-						Target = amd.TryGetValue(xac.TargetId.Value, out var kickMember) ? kickMember : new() { Id = xac.TargetId.Value, Discord = this.Discord, GuildId = this.Id }
-					};
-					break;
-
-				case AuditLogActionType.Prune:
-					entry = new DiscordAuditLogPruneEntry
-					{
-						Days = xac.Options.DeleteMemberDays,
-						Toll = xac.Options.MembersRemoved
-					};
-					break;
-
-				case AuditLogActionType.Ban:
-				case AuditLogActionType.Unban:
-					entry = new DiscordAuditLogBanEntry
-					{
-						Target = amd.TryGetValue(xac.TargetId.Value, out var unbanMember) ? unbanMember : new() { Id = xac.TargetId.Value, Discord = this.Discord, GuildId = this.Id }
-					};
-					break;
-
-				case AuditLogActionType.MemberUpdate:
-				case AuditLogActionType.MemberRoleUpdate:
-					entry = new DiscordAuditLogMemberUpdateEntry
-					{
-						Target = amd.TryGetValue(xac.TargetId.Value, out var roleUpdMember) ? roleUpdMember : new() { Id = xac.TargetId.Value, Discord = this.Discord, GuildId = this.Id }
-					};
-
-					var entrymbu = entry as DiscordAuditLogMemberUpdateEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "nick":
-								entrymbu.NicknameChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "deaf":
-								entrymbu.DeafenChange = new()
-								{
-									Before = (bool?)xc.OldValue,
-									After = (bool?)xc.NewValue
-								};
-								break;
-
-							case "mute":
-								entrymbu.MuteChange = new()
-								{
-									Before = (bool?)xc.OldValue,
-									After = (bool?)xc.NewValue
-								};
-								break;
-							case "communication_disabled_until":
-								entrymbu.CommunicationDisabledUntilChange = new()
-								{
-									Before = (DateTime?)xc.OldValue,
-									After = (DateTime?)xc.NewValue
-								};
-								break;
-
-							case "$add":
-								entrymbu.AddedRoles = new ReadOnlyCollection<DiscordRole>(xc.NewValues.Select(xo => (ulong)xo["id"]).Select(this.GetRole).ToList());
-								break;
-
-							case "$remove":
-								entrymbu.RemovedRoles = new ReadOnlyCollection<DiscordRole>(xc.NewValues.Select(xo => (ulong)xo["id"]).Select(this.GetRole).ToList());
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in member update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-				case AuditLogActionType.RoleCreate:
-				case AuditLogActionType.RoleDelete:
-				case AuditLogActionType.RoleUpdate:
-					entry = new DiscordAuditLogRoleUpdateEntry
-					{
-						Target = this.GetRole(xac.TargetId.Value) ?? new DiscordRole { Id = xac.TargetId.Value, Discord = this.Discord }
-					};
-
-					var entryrol = entry as DiscordAuditLogRoleUpdateEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "name":
-								entryrol.NameChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "color":
-								p1 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t3);
-								p2 = int.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t4);
-
-								entryrol.ColorChange = new()
-								{
-									Before = p1 ? t3 : null,
-									After = p2 ? t4 : null
-								};
-								break;
-
-							case "permissions":
-								entryrol.PermissionChange = new()
-								{
-									Before = xc.OldValue != null ? (Permissions?)long.Parse((string)xc.OldValue) : null,
-									After = xc.NewValue != null ? (Permissions?)long.Parse((string)xc.NewValue) : null
-								};
-								break;
-
-							case "position":
-								entryrol.PositionChange = new()
-								{
-									Before = xc.OldValue != null ? (int?)(long)xc.OldValue : null,
-									After = xc.NewValue != null ? (int?)(long)xc.NewValue : null,
-								};
-								break;
-
-							case "mentionable":
-								entryrol.MentionableChange = new()
-								{
-									Before = xc.OldValue != null ? (bool?)xc.OldValue : null,
-									After = xc.NewValue != null ? (bool?)xc.NewValue : null
-								};
-								break;
-
-							case "hoist":
-								entryrol.HoistChange = new()
-								{
-									Before = (bool?)xc.OldValue,
-									After = (bool?)xc.NewValue
-								};
-								break;
-
-							case "icon_hash":
-								entryrol.IconHashChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in role update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-				case AuditLogActionType.InviteCreate:
-				case AuditLogActionType.InviteDelete:
-				case AuditLogActionType.InviteUpdate:
-					entry = new DiscordAuditLogInviteEntry();
-
-					var inv = new DiscordInvite
-					{
-						Discord = this.Discord,
-						Guild = new()
-						{
-							Discord = this.Discord,
-							Id = this.Id,
-							Name = this.Name,
-							SplashHash = this.SplashHash
-						}
-					};
-
-					var entryinv = entry as DiscordAuditLogInviteEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "max_age":
-								p1 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t3);
-								p2 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t4);
-
-								entryinv.MaxAgeChange = new()
-								{
-									Before = p1 ? t3 : null,
-									After = p2 ? t4 : null
-								};
-								break;
-
-							case "code":
-								inv.Code = xc.OldValueString ?? xc.NewValueString;
-
-								entryinv.CodeChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "temporary":
-								entryinv.TemporaryChange = new()
-								{
-									Before = xc.OldValue != null ? (bool?)xc.OldValue : null,
-									After = xc.NewValue != null ? (bool?)xc.NewValue : null
-								};
-								break;
-
-							case "inviter_id":
-								p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
-								p2 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
-
-								entryinv.InviterChange = new()
-								{
-									Before = amd.TryGetValue(t1, out var propBeforeMember) ? propBeforeMember : new() { Id = t1, Discord = this.Discord, GuildId = this.Id },
-									After = amd.TryGetValue(t2, out var propAfterMember) ? propAfterMember : new() { Id = t1, Discord = this.Discord, GuildId = this.Id },
-								};
-								break;
-
-							case "channel_id":
-								p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
-								p2 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
-
-								entryinv.ChannelChange = new()
-								{
-									Before = p1 ? this.GetChannel(t1) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id } : null,
-									After = p2 ? this.GetChannel(t2) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id } : null
-								};
-
-								var ch = entryinv.ChannelChange.Before ?? entryinv.ChannelChange.After;
-								var cht = ch?.Type;
-								inv.Channel = new()
-								{
-									Discord = this.Discord,
-									Id = p1 ? t1 : t2,
-									Name = ch?.Name,
-									Type = cht != null ? cht.Value : ChannelType.Unknown
-								};
-								break;
-
-							case "uses":
-								p1 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t3);
-								p2 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t4);
-
-								entryinv.UsesChange = new()
-								{
-									Before = p1 ? t3 : null,
-									After = p2 ? t4 : null
-								};
-								break;
-
-							case "max_uses":
-								p1 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t3);
-								p2 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t4);
-
-								entryinv.MaxUsesChange = new()
-								{
-									Before = p1 ? t3 : null,
-									After = p2 ? t4 : null
-								};
-								break;
-
-							// TODO: Add changes for target application
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in invite update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-
-					entryinv.Target = inv;
-					break;
-
-				case AuditLogActionType.WebhookCreate:
-				case AuditLogActionType.WebhookDelete:
-				case AuditLogActionType.WebhookUpdate:
-					entry = new DiscordAuditLogWebhookEntry
-					{
-						Target = ahd.TryGetValue(xac.TargetId.Value, out var webhook) ? webhook : new() { Id = xac.TargetId.Value, Discord = this.Discord }
-					};
-
-					var entrywhk = entry as DiscordAuditLogWebhookEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "application_id": // ???
-								p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
-								p2 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
-
-								entrywhk.IdChange = new()
-								{
-									Before = p1 ? t1 : null,
-									After = p2 ? t2 : null
-								};
-								break;
-
-							case "name":
-								entrywhk.NameChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "channel_id":
-								p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
-								p2 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
-
-								entrywhk.ChannelChange = new()
-								{
-									Before = p1 ? this.GetChannel(t1) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id } : null,
-									After = p2 ? this.GetChannel(t2) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id } : null
-								};
-								break;
-
-							case "type": // ???
-								p1 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t3);
-								p2 = int.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t4);
-
-								entrywhk.TypeChange = new()
-								{
-									Before = p1 ? t3 : null,
-									After = p2 ? t4 : null
-								};
-								break;
-
-							case "avatar_hash":
-								entrywhk.AvatarHashChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in webhook update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-				case AuditLogActionType.EmojiCreate:
-				case AuditLogActionType.EmojiDelete:
-				case AuditLogActionType.EmojiUpdate:
-					entry = new DiscordAuditLogEmojiEntry
-					{
-						Target = this.EmojisInternal.TryGetValue(xac.TargetId.Value, out var target) ? target : new() { Id = xac.TargetId.Value, Discord = this.Discord }
-					};
-
-					var entryemo = entry as DiscordAuditLogEmojiEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "name":
-								entryemo.NameChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in emote update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-				case AuditLogActionType.StageInstanceCreate:
-				case AuditLogActionType.StageInstanceDelete:
-				case AuditLogActionType.StageInstanceUpdate:
-					entry = new DiscordAuditLogStageEntry
-					{
-						Target = this.StageInstancesInternal.TryGetValue(xac.TargetId.Value, out var stage) ? stage : new() { Id = xac.TargetId.Value, Discord = this.Discord }
-					};
-
-					var entrysta = entry as DiscordAuditLogStageEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "topic":
-								entrysta.TopicChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in stage instance update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-				case AuditLogActionType.StickerCreate:
-				case AuditLogActionType.StickerDelete:
-				case AuditLogActionType.StickerUpdate:
-					entry = new DiscordAuditLogStickerEntry
-					{
-						Target = this.StickersInternal.TryGetValue(xac.TargetId.Value, out var sticker) ? sticker : new() { Id = xac.TargetId.Value, Discord = this.Discord }
-					};
-
-					var entrysti = entry as DiscordAuditLogStickerEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "name":
-								entrysti.NameChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-							case "description":
-								entrysti.DescriptionChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-							case "tags":
-								entrysti.TagsChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-							case "guild_id":
-								entrysti.GuildIdChange = new()
-								{
-									Before = ulong.TryParse(xc.OldValueString, out var ogid) ? ogid : null,
-									After = ulong.TryParse(xc.NewValueString, out var ngid) ? ngid : null
-								};
-								break;
-							case "available":
-								entrysti.AvailabilityChange = new()
-								{
-									Before = (bool?)xc.OldValue,
-									After = (bool?)xc.NewValue,
-								};
-								break;
-							case "asset":
-								entrysti.AssetChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-							case "id":
-								entrysti.IdChange = new()
-								{
-									Before = ulong.TryParse(xc.OldValueString, out var oid) ? oid : null,
-									After = ulong.TryParse(xc.NewValueString, out var nid) ? nid : null
-								};
-								break;
-							case "type":
-								p1 = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5);
-								p2 = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6);
-								entrysti.TypeChange = new()
-								{
-									Before = p1 ? (StickerType?)t5 : null,
-									After = p2 ? (StickerType?)t6 : null
-								};
-								break;
-							case "format_type":
-								p1 = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5);
-								p2 = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6);
-								entrysti.FormatChange = new()
-								{
-									Before = p1 ? (StickerFormat?)t5 : null,
-									After = p2 ? (StickerFormat?)t6 : null
-								};
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in sticker update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-
-
-				case AuditLogActionType.MessageDelete:
-				case AuditLogActionType.MessageBulkDelete:
-				{
-					entry = new DiscordAuditLogMessageEntry();
-
-					var entrymsg = entry as DiscordAuditLogMessageEntry;
-
-					if (xac.Options != null)
-					{
-						entrymsg.Channel = this.GetChannel(xac.Options.ChannelId) ?? new DiscordChannel { Id = xac.Options.ChannelId, Discord = this.Discord, GuildId = this.Id };
-						entrymsg.MessageCount = xac.Options.Count;
-					}
-
-					if (entrymsg.Channel != null)
-					{
-						entrymsg.Target = this.Discord is DiscordClient dc
-							&& dc.MessageCache != null
-							&& dc.MessageCache.TryGet(xm => xm.Id == xac.TargetId.Value && xm.ChannelId == entrymsg.Channel.Id, out var msg)
-							? msg
-							: new() { Discord = this.Discord, Id = xac.TargetId.Value };
-					}
-					break;
-				}
-
-				case AuditLogActionType.MessagePin:
-				case AuditLogActionType.MessageUnpin:
-				{
-					entry = new DiscordAuditLogMessagePinEntry();
-
-					var entrypin = entry as DiscordAuditLogMessagePinEntry;
-
-					if (this.Discord is not DiscordClient dc)
-					{
-						break;
-					}
-
-					if (xac.Options != null)
-					{
-						DiscordMessage message = default;
-						dc.MessageCache?.TryGet(x => x.Id == xac.Options.MessageId && x.ChannelId == xac.Options.ChannelId, out message);
-
-						entrypin.Channel = this.GetChannel(xac.Options.ChannelId) ?? new DiscordChannel { Id = xac.Options.ChannelId, Discord = this.Discord, GuildId = this.Id };
-						entrypin.Message = message ?? new DiscordMessage { Id = xac.Options.MessageId, Discord = this.Discord };
-					}
-
-					if (xac.TargetId.HasValue)
-					{
-						dc.UserCache.TryGetValue(xac.TargetId.Value, out var user);
-						entrypin.Target = user ?? new DiscordUser { Id = user.Id, Discord = this.Discord };
-					}
-
-					break;
-				}
-
-				case AuditLogActionType.BotAdd:
-				{
-					entry = new DiscordAuditLogBotAddEntry();
-
-					if (!(this.Discord is DiscordClient dc && xac.TargetId.HasValue))
-					{
-						break;
-					}
-
-					dc.UserCache.TryGetValue(xac.TargetId.Value, out var bot);
-					(entry as DiscordAuditLogBotAddEntry).TargetBot = bot ?? new DiscordUser { Id = xac.TargetId.Value, Discord = this.Discord };
-
-					break;
-				}
-
-				case AuditLogActionType.MemberMove:
-					entry = new DiscordAuditLogMemberMoveEntry();
-
-					if (xac.Options == null)
-					{
-						break;
-					}
-
-					var moveentry = entry as DiscordAuditLogMemberMoveEntry;
-
-					moveentry.UserCount = xac.Options.Count;
-					moveentry.Channel = this.GetChannel(xac.Options.ChannelId) ?? new DiscordChannel { Id = xac.Options.ChannelId, Discord = this.Discord, GuildId = this.Id };
-					break;
-
-				case AuditLogActionType.MemberDisconnect:
-					entry = new DiscordAuditLogMemberDisconnectEntry
-					{
-						UserCount = xac.Options?.Count ?? 0
-					};
-					break;
-
-				case AuditLogActionType.IntegrationCreate:
-				case AuditLogActionType.IntegrationDelete:
-				case AuditLogActionType.IntegrationUpdate:
-					entry = new DiscordAuditLogIntegrationEntry();
-
-					var integentry = entry as DiscordAuditLogIntegrationEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "type":
-								integentry.Type = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-							case "enable_emoticons":
-								integentry.EnableEmoticons = new()
-								{
-									Before = (bool?)xc.OldValue,
-									After = (bool?)xc.NewValue
-								};
-								break;
-							case "expire_behavior":
-								integentry.ExpireBehavior = new()
-								{
-									Before = (int?)xc.OldValue,
-									After = (int?)xc.NewValue
-								};
-								break;
-							case "expire_grace_period":
-								integentry.ExpireBehavior = new()
-								{
-									Before = (int?)xc.OldValue,
-									After = (int?)xc.NewValue
-								};
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in integration update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-				case AuditLogActionType.ThreadCreate:
-				case AuditLogActionType.ThreadDelete:
-				case AuditLogActionType.ThreadUpdate:
-					entry = new DiscordAuditLogThreadEntry
-					{
-						Target = this.ThreadsInternal.TryGetValue(xac.TargetId.Value, out var thread) ? thread : new() { Id = xac.TargetId.Value, Discord = this.Discord }
-					};
-
-					var entrythr = entry as DiscordAuditLogThreadEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "name":
-								entrythr.NameChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "type":
-								p1 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
-								p2 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
-
-								entrythr.TypeChange = new()
-								{
-									Before = p1 ? (ChannelType?)t1 : null,
-									After = p2 ? (ChannelType?)t2 : null
-								};
-								break;
-
-							case "archived":
-								entrythr.ArchivedChange = new()
-								{
-									Before = xc.OldValue != null ? (bool?)xc.OldValue : null,
-									After = xc.NewValue != null ? (bool?)xc.NewValue : null
-								};
-								break;
-
-							case "locked":
-								entrythr.LockedChange = new()
-								{
-									Before = xc.OldValue != null ? (bool?)xc.OldValue : null,
-									After = xc.NewValue != null ? (bool?)xc.NewValue : null
-								};
-								break;
-
-							case "invitable":
-								entrythr.InvitableChange = new()
-								{
-									Before = xc.OldValue != null ? (bool?)xc.OldValue : null,
-									After = xc.NewValue != null ? (bool?)xc.NewValue : null
-								};
-								break;
-
-							case "auto_archive_duration":
-								p1 = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5);
-								p2 = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6);
-
-								entrythr.AutoArchiveDurationChange = new()
-								{
-									Before = p1 ? (ThreadAutoArchiveDuration?)t5 : null,
-									After = p2 ? (ThreadAutoArchiveDuration?)t6 : null
-								};
-								break;
-
-							case "rate_limit_per_user":
-								entrythr.PerUserRateLimitChange = new()
-								{
-									Before = (int?)(long?)xc.OldValue,
-									After = (int?)(long?)xc.NewValue
-								};
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in thread update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-
-				case AuditLogActionType.GuildScheduledEventCreate:
-				case AuditLogActionType.GuildScheduledEventDelete:
-				case AuditLogActionType.GuildScheduledEventUpdate:
-					entry = new DiscordAuditLogGuildScheduledEventEntry
-					{
-						Target = this.ScheduledEventsInternal.TryGetValue(xac.TargetId.Value, out var scheduledEvent) ? scheduledEvent : new() { Id = xac.TargetId.Value, Discord = this.Discord }
-					};
-
-					var entryse = entry as DiscordAuditLogGuildScheduledEventEntry;
-					foreach (var xc in xac.Changes)
-					{
-						switch (xc.Key.ToLowerInvariant())
-						{
-							case "channel_id":
-								entryse.ChannelIdChange = new()
-								{
-									Before = ulong.TryParse(xc.OldValueString, out var ogid) ? ogid : null,
-									After = ulong.TryParse(xc.NewValueString, out var ngid) ? ngid : null
-								};
-								break;
-
-							case "name":
-								entryse.NameChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "description":
-								entryse.DescriptionChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "location":
-								entryse.LocationChange = new()
-								{
-									Before = xc.OldValueString,
-									After = xc.NewValueString
-								};
-								break;
-
-							case "entity_type":
-								p1 = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5);
-								p2 = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6);
-
-								entryse.EntityTypeChange = new()
-								{
-									Before = p1 ? (ScheduledEventEntityType?)t5 : null,
-									After = p2 ? (ScheduledEventEntityType?)t6 : null
-								};
-								break;
-
-							case "status":
-								p1 = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5);
-								p2 = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6);
-
-								entryse.StatusChange = new()
-								{
-									Before = p1 ? (ScheduledEventStatus?)t5 : null,
-									After = p2 ? (ScheduledEventStatus?)t6 : null
-								};
-								break;
-
-							default:
-								if (this.Discord.Configuration.ReportMissingFields)
-									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in scheduled event update: {Key} - this should be reported to library developers", xc.Key);
-								break;
-						}
-					}
-					break;
-
-				// TODO: Handle ApplicationCommandPermissionUpdate
-				case AuditLogActionType.ApplicationCommandPermissionUpdate:
-					break;
-
-				// TODO: Implement auto mod audit log
-				case AuditLogActionType.AutoModerationRuleCreate:
-				case AuditLogActionType.AutoModerationRuleUpdate:
-				case AuditLogActionType.AutoModerationRuleDelete:
-					break;
-
-				case AuditLogActionType.AutoModerationBlockMessage:
-					break;
-
-				case AuditLogActionType.AutoModerationFlagMessage:
-					break;
-
-				case AuditLogActionType.AutoModerationTimeOutUser:
-					break;
-
-				case AuditLogActionType.AutoModerationQuarantineUser:
-					break;
-
-				case AuditLogActionType.OnboardingQuestionCreate:
-				case AuditLogActionType.OnboardingQuestionUpdate:
-				case AuditLogActionType.OnboardingUpdate:
-				case AuditLogActionType.ServerGuideCreate:
-				case AuditLogActionType.ServerGuideUpdate:
-					break;
-
-				case AuditLogActionType.VoiceChannelStatusUpdate:
-					break;
-
-				default:
-					this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown audit log action type: {Key} - this should be reported to library developers", (int)xac.ActionType);
-					break;
-			}
-
-			if (entry == null)
-				continue;
-
-			entry.ActionCategory = xac.ActionType switch
-			{
-				AuditLogActionType.ChannelCreate or AuditLogActionType.EmojiCreate or AuditLogActionType.InviteCreate or AuditLogActionType.OverwriteCreate or AuditLogActionType.RoleCreate or AuditLogActionType.WebhookCreate or AuditLogActionType.IntegrationCreate or AuditLogActionType.StickerCreate or AuditLogActionType.StageInstanceCreate or AuditLogActionType.ThreadCreate or AuditLogActionType.GuildScheduledEventCreate or AuditLogActionType.AutoModerationRuleCreate or AuditLogActionType.OnboardingQuestionCreate or AuditLogActionType.ServerGuideCreate => AuditLogActionCategory.Create,
-				AuditLogActionType.ChannelDelete or AuditLogActionType.EmojiDelete or AuditLogActionType.InviteDelete or AuditLogActionType.MessageDelete or AuditLogActionType.MessageBulkDelete or AuditLogActionType.OverwriteDelete or AuditLogActionType.RoleDelete or AuditLogActionType.WebhookDelete or AuditLogActionType.IntegrationDelete or AuditLogActionType.StickerDelete or AuditLogActionType.StageInstanceDelete or AuditLogActionType.ThreadDelete or AuditLogActionType.GuildScheduledEventDelete or AuditLogActionType.AutoModerationRuleDelete => AuditLogActionCategory.Delete,
-				AuditLogActionType.ChannelUpdate or AuditLogActionType.EmojiUpdate or AuditLogActionType.InviteUpdate or AuditLogActionType.MemberRoleUpdate or AuditLogActionType.MemberUpdate or AuditLogActionType.OverwriteUpdate or AuditLogActionType.RoleUpdate or AuditLogActionType.WebhookUpdate or AuditLogActionType.IntegrationUpdate or AuditLogActionType.StickerUpdate or AuditLogActionType.StageInstanceUpdate or AuditLogActionType.ThreadUpdate or AuditLogActionType.GuildScheduledEventUpdate or AuditLogActionType.AutoModerationRuleUpdate or AuditLogActionType.OnboardingQuestionUpdate or AuditLogActionType.OnboardingUpdate or AuditLogActionType.ServerGuideUpdate or AuditLogActionType.VoiceChannelStatusUpdate => AuditLogActionCategory.Update,
-				_ => AuditLogActionCategory.Other,
-			};
-			entry.Discord = this.Discord;
-			entry.ActionType = xac.ActionType;
-			entry.Id = xac.Id;
-			entry.Reason = xac.Reason;
-			entry.UserResponsible = amd.Any() && amd.TryGetValue(xac.UserId, out var resp) ? resp : this.MembersInternal[xac.UserId];
-			entries.Add(entry);
-		}
-
-		return new ReadOnlyCollection<DiscordAuditLogEntry>(entries);
-	}
-}
diff --git a/DisCatSharp/Entities/Guild/DiscordGuild.Features.cs b/DisCatSharp/Entities/Guild/DiscordGuild.Features.cs
index 07da4d43e3..68d2ad49da 100644
--- a/DisCatSharp/Entities/Guild/DiscordGuild.Features.cs
+++ b/DisCatSharp/Entities/Guild/DiscordGuild.Features.cs
@@ -149,6 +149,7 @@ private static string AddSpacesToWord(string text)
 	{
 		if (string.IsNullOrWhiteSpace(text))
 			return "";
+
 		var newText = new StringBuilder(text.Length * 2);
 		newText.Append(text[0]);
 		for (var i = 1; i < text.Length; i++)
@@ -157,6 +158,7 @@ private static string AddSpacesToWord(string text)
 				newText.Append(' ');
 			newText.Append(text[i]);
 		}
+
 		return newText.ToString();
 	}
 }
@@ -640,5 +642,5 @@ public enum GuildFeaturesEnum
 
 	RaidAlertsEnabled,
 
-	UsesApplicationCommandsPermissionsV2,
+	UsesApplicationCommandsPermissionsV2
 }
diff --git a/DisCatSharp/Entities/Guild/DiscordGuild.cs b/DisCatSharp/Entities/Guild/DiscordGuild.cs
index 29dafed49f..003859ca66 100644
--- a/DisCatSharp/Entities/Guild/DiscordGuild.cs
+++ b/DisCatSharp/Entities/Guild/DiscordGuild.cs
@@ -54,7 +54,7 @@ public string IconUrl
 	/// </summary>
 	[JsonIgnore]
 	public string SplashUrl
-	 => !string.IsNullOrWhiteSpace(this.SplashHash) ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.SPLASHES}/{this.Id.ToString(CultureInfo.InvariantCulture)}/{this.SplashHash}.png?size=1024" : null;
+		=> !string.IsNullOrWhiteSpace(this.SplashHash) ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.SPLASHES}/{this.Id.ToString(CultureInfo.InvariantCulture)}/{this.SplashHash}.png?size=1024" : null;
 
 	/// <summary>
 	/// Gets the guild discovery splash's hash.
@@ -143,6 +143,7 @@ public DiscordChannel AfkChannel
 	[JsonIgnore]
 	public ReadOnlyCollection<DiscordApplicationCommand> RegisteredApplicationCommands
 		=> new(this.InternalRegisteredApplicationCommands);
+
 	[JsonIgnore]
 	internal List<DiscordApplicationCommand> InternalRegisteredApplicationCommands { get; set; } = new();
 
@@ -188,8 +189,8 @@ public ReadOnlyCollection<DiscordApplicationCommand> RegisteredApplicationComman
 	[JsonIgnore]
 	public DiscordChannel SystemChannel
 		=> this.SystemChannelId.HasValue
-		? this.GetChannel(this.SystemChannelId.Value)
-		: null;
+			? this.GetChannel(this.SystemChannelId.Value)
+			: null;
 
 	/// <summary>
 	/// Gets the settings for this guild's system channel.
@@ -215,8 +216,8 @@ public DiscordChannel SystemChannel
 	[JsonIgnore]
 	public DiscordChannel WidgetChannel
 		=> this.WidgetChannelId.HasValue
-		? this.GetChannel(this.WidgetChannelId.Value)
-		: null;
+			? this.GetChannel(this.WidgetChannelId.Value)
+			: null;
 
 	/// <summary>
 	/// Gets the safety alerts channel id.
@@ -230,8 +231,8 @@ public DiscordChannel WidgetChannel
 	[JsonIgnore, RequiresFeature(Attributes.Features.Community)]
 	public DiscordChannel SafetyAltersChannel
 		=> this.SafetyAlertsChannelId.HasValue
-		? this.GetChannel(this.SafetyAlertsChannelId.Value)
-		: null;
+			? this.GetChannel(this.SafetyAlertsChannelId.Value)
+			: null;
 
 	/// <summary>
 	/// Gets the rules channel id.
@@ -246,8 +247,8 @@ public DiscordChannel SafetyAltersChannel
 	[JsonIgnore, RequiresFeature(Attributes.Features.Community)]
 	public DiscordChannel RulesChannel
 		=> this.RulesChannelId.HasValue
-		? this.GetChannel(this.RulesChannelId.Value)
-		: null;
+			? this.GetChannel(this.RulesChannelId.Value)
+			: null;
 
 	/// <summary>
 	/// Gets the public updates channel id.
@@ -262,8 +263,8 @@ public DiscordChannel RulesChannel
 	[JsonIgnore, RequiresFeature(Attributes.Features.Community)]
 	public DiscordChannel PublicUpdatesChannel
 		=> this.PublicUpdatesChannelId.HasValue
-		? this.GetChannel(this.PublicUpdatesChannelId.Value)
-		: null;
+			? this.GetChannel(this.PublicUpdatesChannelId.Value)
+			: null;
 
 	/// <summary>
 	/// Gets the application id of this guild if it is bot created.
@@ -278,8 +279,7 @@ public DiscordChannel PublicUpdatesChannel
 	public IReadOnlyDictionary<ulong, DiscordRole> Roles
 		=> new ReadOnlyConcurrentDictionary<ulong, DiscordRole>(this.RolesInternal);
 
-	[JsonProperty("roles", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("roles", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordRole> RolesInternal;
 
 	/// <summary>
@@ -289,8 +289,7 @@ public IReadOnlyDictionary<ulong, DiscordRole> Roles
 	public IReadOnlyDictionary<ulong, DiscordSticker> Stickers
 		=> new ReadOnlyConcurrentDictionary<ulong, DiscordSticker>(this.StickersInternal);
 
-	[JsonProperty("stickers", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("stickers", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordSticker> StickersInternal;
 
 	/// <summary>
@@ -300,8 +299,7 @@ public IReadOnlyDictionary<ulong, DiscordSticker> Stickers
 	public IReadOnlyDictionary<ulong, DiscordEmoji> Emojis
 		=> new ReadOnlyConcurrentDictionary<ulong, DiscordEmoji>(this.EmojisInternal);
 
-	[JsonProperty("emojis", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("emojis", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordEmoji> EmojisInternal;
 
 	/// <summary>
@@ -389,8 +387,7 @@ public IReadOnlyDictionary<ulong, DiscordEmoji> Emojis
 	[JsonIgnore]
 	public IReadOnlyDictionary<ulong, DiscordVoiceState> VoiceStates => new ReadOnlyConcurrentDictionary<ulong, DiscordVoiceState>(this.VoiceStatesInternal);
 
-	[JsonProperty("voice_states", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("voice_states", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordVoiceState> VoiceStatesInternal;
 
 	/// <summary>
@@ -399,8 +396,7 @@ public IReadOnlyDictionary<ulong, DiscordEmoji> Emojis
 	[JsonIgnore]
 	public IReadOnlyDictionary<ulong, DiscordMember> Members => new ReadOnlyConcurrentDictionary<ulong, DiscordMember>(this.MembersInternal);
 
-	[JsonProperty("members", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("members", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordMember> MembersInternal;
 
 	/// <summary>
@@ -409,8 +405,7 @@ public IReadOnlyDictionary<ulong, DiscordEmoji> Emojis
 	[JsonIgnore]
 	public IReadOnlyDictionary<ulong, DiscordChannel> Channels => new ReadOnlyConcurrentDictionary<ulong, DiscordChannel>(this.ChannelsInternal);
 
-	[JsonProperty("channels", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("channels", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordChannel> ChannelsInternal;
 
 	internal ConcurrentDictionary<string, DiscordInvite> Invites;
@@ -421,8 +416,7 @@ public IReadOnlyDictionary<ulong, DiscordEmoji> Emojis
 	[JsonIgnore]
 	public IReadOnlyDictionary<ulong, DiscordThreadChannel> Threads { get; internal set; }
 
-	[JsonProperty("threads", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("threads", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordThreadChannel> ThreadsInternal = new();
 
 	/// <summary>
@@ -431,8 +425,7 @@ public IReadOnlyDictionary<ulong, DiscordEmoji> Emojis
 	[JsonIgnore]
 	public IReadOnlyDictionary<ulong, DiscordStageInstance> StageInstances { get; internal set; }
 
-	[JsonProperty("stage_instances", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("stage_instances", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordStageInstance> StageInstancesInternal = new();
 
 	/// <summary>
@@ -441,8 +434,7 @@ public IReadOnlyDictionary<ulong, DiscordEmoji> Emojis
 	[JsonIgnore]
 	public IReadOnlyDictionary<ulong, DiscordScheduledEvent> ScheduledEvents { get; internal set; }
 
-	[JsonProperty("guild_scheduled_events", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("guild_scheduled_events", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordScheduledEvent> ScheduledEventsInternal = new();
 
 	/// <summary>
@@ -602,6 +594,7 @@ private Dictionary<ulong, DiscordChannel> InternalSortChannels()
 			foreach (var chan in orderedChannel.Value)
 				keyValuePairs.Add(chan.Id, chan);
 		}
+
 		return keyValuePairs;
 	}
 
@@ -618,31 +611,23 @@ public Dictionary<ulong, List<DiscordChannel>> GetOrderedChannels()
 
 		Dictionary<ulong, List<DiscordChannel>> orderedChannels = new()
 		{
-			{ 0, new() }
+			{
+				0, new()
+			}
 		};
 
 		foreach (var channel in rawChannels.Where(c => c.Type == ChannelType.Category).OrderBy(c => c.Position))
-		{
 			orderedChannels.Add(channel.Id, new());
-		}
 
 		foreach (var channel in rawChannels.Where(c => c.ParentId.HasValue && (c.Type == ChannelType.Text || c.Type == ChannelType.News || c.Type == ChannelType.Forum)).OrderBy(c => c.Position))
-		{
 			orderedChannels[channel.ParentId.Value!].Add(channel);
-		}
 		foreach (var channel in rawChannels.Where(c => c.ParentId.HasValue && (c.Type == ChannelType.Voice || c.Type == ChannelType.Stage)).OrderBy(c => c.Position))
-		{
 			orderedChannels[channel.ParentId.Value!].Add(channel);
-		}
 
 		foreach (var channel in rawChannels.Where(c => !c.ParentId.HasValue && c.Type != ChannelType.Category && (c.Type == ChannelType.Text || c.Type == ChannelType.News || c.Type == ChannelType.Forum)).OrderBy(c => c.Position))
-		{
 			orderedChannels[0].Add(channel);
-		}
 		foreach (var channel in rawChannels.Where(c => !c.ParentId.HasValue && c.Type != ChannelType.Category && (c.Type == ChannelType.Voice || c.Type == ChannelType.Stage)).OrderBy(c => c.Position))
-		{
 			orderedChannels[0].Add(channel);
-		}
 
 		return orderedChannels;
 	}
@@ -660,31 +645,23 @@ public async Task<Dictionary<ulong, List<DiscordChannel>>> GetOrderedChannelsAsy
 
 		Dictionary<ulong, List<DiscordChannel>> orderedChannels = new()
 		{
-			{ 0, new() }
+			{
+				0, new()
+			}
 		};
 
 		foreach (var channel in rawChannels.Where(c => c.Type == ChannelType.Category).OrderBy(c => c.Position))
-		{
 			orderedChannels.Add(channel.Id, new());
-		}
 
 		foreach (var channel in rawChannels.Where(c => c.ParentId.HasValue && (c.Type == ChannelType.Text || c.Type == ChannelType.News || c.Type == ChannelType.Forum)).OrderBy(c => c.Position))
-		{
 			orderedChannels[channel.ParentId.Value!].Add(channel);
-		}
 		foreach (var channel in rawChannels.Where(c => c.ParentId.HasValue && (c.Type == ChannelType.Voice || c.Type == ChannelType.Stage)).OrderBy(c => c.Position))
-		{
 			orderedChannels[channel.ParentId.Value!].Add(channel);
-		}
 
 		foreach (var channel in rawChannels.Where(c => !c.ParentId.HasValue && c.Type != ChannelType.Category && (c.Type == ChannelType.Text || c.Type == ChannelType.News || c.Type == ChannelType.Forum)).OrderBy(c => c.Position))
-		{
 			orderedChannels[0].Add(channel);
-		}
 		foreach (var channel in rawChannels.Where(c => !c.ParentId.HasValue && c.Type != ChannelType.Category && (c.Type == ChannelType.Voice || c.Type == ChannelType.Stage)).OrderBy(c => c.Position))
-		{
 			orderedChannels[0].Add(channel);
-		}
 
 		return orderedChannels;
 	}
@@ -707,7 +684,7 @@ internal DiscordGuild()
 		this.ScheduledEvents = new ReadOnlyConcurrentDictionary<ulong, DiscordScheduledEvent>(this.ScheduledEventsInternal);
 	}
 
-	#region Guild Methods
+#region Guild Methods
 
 	/// <summary>
 	/// Gets this guilds onboarding configuration.
@@ -730,9 +707,13 @@ public Task<DiscordOnboarding> GetOnboardingAsync()
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	[RequiresFeature(Attributes.Features.Community)]
-	public Task<DiscordOnboarding> ModifyOnboardingAsync(Optional<List<DiscordOnboardingPrompt>> prompts = default,
-		Optional<List<ulong>> defaultChannelIds = default, Optional<bool> enabled = default, Optional<OnboardingMode> mode = default,
-		string? reason = null)
+	public Task<DiscordOnboarding> ModifyOnboardingAsync(
+		Optional<List<DiscordOnboardingPrompt>> prompts = default,
+		Optional<List<ulong>> defaultChannelIds = default,
+		Optional<bool> enabled = default,
+		Optional<OnboardingMode> mode = default,
+		string? reason = null
+	)
 		=> this.Discord.ApiClient.ModifyGuildOnboardingAsync(this.Id, prompts, defaultChannelIds, enabled, mode,
 			reason);
 
@@ -782,8 +763,14 @@ public Task<IReadOnlyList<DiscordMember>> SearchMembersAsync(string name, int? l
 	/// <exception cref="NotFoundException">Thrown when the <paramref name="user"/> or <paramref name="accessToken"/> is not found.</exception>
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
-	public Task AddMemberAsync(DiscordUser user, string accessToken, string nickname = null, IEnumerable<DiscordRole> roles = null,
-		bool muted = false, bool deaf = false)
+	public Task AddMemberAsync(
+		DiscordUser user,
+		string accessToken,
+		string nickname = null,
+		IEnumerable<DiscordRole> roles = null,
+		bool muted = false,
+		bool deaf = false
+	)
 		=> this.Discord.ApiClient.AddGuildMemberAsync(this.Id, user.Id, accessToken, nickname, roles, muted, deaf);
 
 	/// <summary>
@@ -811,7 +798,6 @@ public Task EnableMfaAsync(string? reason = null)
 	/// <exception cref="UnauthorizedException">Thrown when the current user is not the guilds owner.</exception>
 	/// <exception cref="NotFoundException">Thrown when the guild does not exist.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
-
 	public Task DisableMfaAsync(string? reason = null)
 		=> this.IsOwner ? this.Discord.ApiClient.DisableGuildMfaAsync(this.Id, reason) : throw new("The current user does not own the guild.");
 
@@ -875,9 +861,7 @@ public async Task<DiscordGuild> ModifyCommunitySettingsAsync(bool enabled, Disco
 	{
 		var verificationLevel = this.VerificationLevel;
 		if (this.VerificationLevel != VerificationLevel.Highest)
-		{
 			verificationLevel = VerificationLevel.High;
-		}
 
 		var explicitContentFilter = ExplicitContentFilter.AllMembers;
 
@@ -893,13 +877,9 @@ public async Task<DiscordGuild> ModifyCommunitySettingsAsync(bool enabled, Disco
 
 		var rfeatures = this.RawFeatures.ToList();
 		if (!this.RawFeatures.Contains("COMMUNITY") && enabled)
-		{
 			rfeatures.Add("COMMUNITY");
-		}
 		else if (this.RawFeatures.Contains("COMMUNITY") && !enabled)
-		{
 			rfeatures.Remove("COMMUNITY");
-		}
 
 		return await this.Discord.ApiClient.ModifyGuildCommunitySettingsAsync(this.Id, rfeatures, rulesChannelId, publicUpdatesChannelId, preferredLocale, description, defaultMessageNotifications, explicitContentFilter, verificationLevel, reason).ConfigureAwait(false);
 	}
@@ -937,13 +917,9 @@ public async Task<DiscordGuild> ModifySafetyAlertsSettingsAsync(bool enabled, Di
 
 		var rfeatures = this.RawFeatures.ToList();
 		if (!this.RawFeatures.Contains("RAID_ALERTS_ENABLED") && enabled)
-		{
 			rfeatures.Add("RAID_ALERTS_ENABLED");
-		}
 		else if (this.RawFeatures.Contains("RAID_ALERTS_ENABLED") && !enabled)
-		{
 			rfeatures.Remove("RAID_ALERTS_ENABLED");
-		}
 
 		return await this.Discord.ApiClient.ModifyGuildSafetyAlertsSettingsAsync(this.Id, rfeatures, safetyAlertsChannelId, reason).ConfigureAwait(false);
 	}
@@ -1161,7 +1137,6 @@ public Task<DiscordBan> GetBanAsync(ulong userId)
 		}
 	}
 
-
 	/// <summary>
 	/// Gets a ban for a specific user.
 	/// </summary>
@@ -1222,11 +1197,20 @@ public Task<AutomodRule> GetAutomodRuleAsync(ulong ruleId)
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	[RequiresFeature(Attributes.Features.Community)]
-	public async Task<AutomodRule> CreateAutomodRuleAsync(string name, AutomodEventType eventType, AutomodTriggerType triggerType, IEnumerable<AutomodAction> actions,
-		AutomodTriggerMetadata triggerMetadata = null, bool enabled = false, IEnumerable<ulong> exemptRoles = null, IEnumerable<ulong> exemptChannels = null, string reason = null)
+	public async Task<AutomodRule> CreateAutomodRuleAsync(
+		string name,
+		AutomodEventType eventType,
+		AutomodTriggerType triggerType,
+		IEnumerable<AutomodAction> actions,
+		AutomodTriggerMetadata triggerMetadata = null,
+		bool enabled = false,
+		IEnumerable<ulong> exemptRoles = null,
+		IEnumerable<ulong> exemptChannels = null,
+		string reason = null
+	)
 		=> await this.Discord.ApiClient.CreateAutomodRuleAsync(this.Id, name, eventType, triggerType, actions, triggerMetadata, enabled, exemptRoles, exemptChannels, reason).ConfigureAwait(false);
 
-	#region Scheduled Events
+#region Scheduled Events
 
 	/// <summary>
 	/// Creates a scheduled event.
@@ -1270,7 +1254,6 @@ public async Task<DiscordScheduledEvent> CreateExternalScheduledEventAsync(strin
 		return await this.Discord.ApiClient.CreateGuildScheduledEventAsync(this.Id, null, new(location), name, scheduledStartTime, scheduledEndTime, description, ScheduledEventEntityType.External, coverb64, reason).ConfigureAwait(false);
 	}
 
-
 	/// <summary>
 	/// Gets a specific scheduled events.
 	/// </summary>
@@ -1345,7 +1328,8 @@ public async Task<DiscordScheduledEvent> GetScheduledEventAsync(DiscordScheduled
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public async Task<IReadOnlyDictionary<ulong, DiscordScheduledEvent>> GetScheduledEventsAsync(bool? withUserCount = null)
 		=> await this.Discord.ApiClient.ListGuildScheduledEventsAsync(this.Id, withUserCount).ConfigureAwait(false);
-	#endregion
+
+#endregion
 
 	/// <summary>
 	/// Creates a new text channel in this guild.
@@ -1388,8 +1372,21 @@ public Task<DiscordChannel> CreateTextChannelAsync(string name, DiscordChannel p
 	/// <exception cref="NotFoundException">Thrown when the guild does not exist.</exception>
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
-	public Task<DiscordChannel> CreateForumChannelAsync(string name, DiscordChannel parent = null, Optional<string> topic = default, IEnumerable<DiscordOverwriteBuilder> overwrites = null, bool? nsfw = null, Optional<ForumReactionEmoji> defaultReactionEmoji = default, Optional<int?> perUserRateLimit = default, Optional<int?> postCreateUserRateLimit = default, ThreadAutoArchiveDuration defaultAutoArchiveDuration = ThreadAutoArchiveDuration.OneDay, Optional<ForumPostSortOrder> defaultSortOrder = default, Optional<ChannelFlags?> flags = default, string reason = null)
-		 => this.Discord.ApiClient.CreateForumChannelAsync(this.Id, name, parent?.Id, topic, null, nsfw, defaultReactionEmoji, perUserRateLimit, postCreateUserRateLimit, defaultSortOrder, defaultAutoArchiveDuration, overwrites, flags, reason);
+	public Task<DiscordChannel> CreateForumChannelAsync(
+		string name,
+		DiscordChannel parent = null,
+		Optional<string> topic = default,
+		IEnumerable<DiscordOverwriteBuilder> overwrites = null,
+		bool? nsfw = null,
+		Optional<ForumReactionEmoji> defaultReactionEmoji = default,
+		Optional<int?> perUserRateLimit = default,
+		Optional<int?> postCreateUserRateLimit = default,
+		ThreadAutoArchiveDuration defaultAutoArchiveDuration = ThreadAutoArchiveDuration.OneDay,
+		Optional<ForumPostSortOrder> defaultSortOrder = default,
+		Optional<ChannelFlags?> flags = default,
+		string reason = null
+	)
+		=> this.Discord.ApiClient.CreateForumChannelAsync(this.Id, name, parent?.Id, topic, null, nsfw, defaultReactionEmoji, perUserRateLimit, postCreateUserRateLimit, defaultSortOrder, defaultAutoArchiveDuration, overwrites, flags, reason);
 
 	/// <summary>
 	/// Creates a new channel category in this guild.
@@ -1479,7 +1476,21 @@ public Task<DiscordChannel> CreateVoiceChannelAsync(string name, DiscordChannel
 	/// <exception cref="NotFoundException">Thrown when the guild does not exist.</exception>
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
-	public Task<DiscordChannel> CreateChannelAsync(string name, ChannelType type, DiscordChannel parent = null, Optional<string> topic = default, int? bitrate = null, int? userLimit = null, IEnumerable<DiscordOverwriteBuilder> overwrites = null, bool? nsfw = null, Optional<int?> perUserRateLimit = default, VideoQualityMode? qualityMode = null, ThreadAutoArchiveDuration? defaultAutoArchiveDuration = null, Optional<ChannelFlags?> flags = default, string reason = null) =>
+	public Task<DiscordChannel> CreateChannelAsync(
+		string name,
+		ChannelType type,
+		DiscordChannel parent = null,
+		Optional<string> topic = default,
+		int? bitrate = null,
+		int? userLimit = null,
+		IEnumerable<DiscordOverwriteBuilder> overwrites = null,
+		bool? nsfw = null,
+		Optional<int?> perUserRateLimit = default,
+		VideoQualityMode? qualityMode = null,
+		ThreadAutoArchiveDuration? defaultAutoArchiveDuration = null,
+		Optional<ChannelFlags?> flags = default,
+		string reason = null
+	) =>
 		// technically you can create news/store channels but not always
 		type != ChannelType.Text && type != ChannelType.Voice && type != ChannelType.Category && type != ChannelType.News && type != ChannelType.Store && type != ChannelType.Stage
 			? throw new ArgumentException("Channel type must be text, voice, stage, or category.", nameof(type))
@@ -1654,10 +1665,8 @@ public async Task<IReadOnlyList<DiscordInvite>> GetInvitesAsync()
 		var intents = this.Discord.Configuration.Intents;
 
 		if (!intents.HasIntent(DiscordIntents.GuildInvites))
-		{
 			foreach (var r in res)
 				this.Invites[r.Code] = r;
-		}
 
 		return res;
 	}
@@ -1693,7 +1702,7 @@ public string GetWidgetImage(WidgetType bannerType = WidgetType.Shield)
 			WidgetType.Banner2 => "banner2",
 			WidgetType.Banner3 => "banner3",
 			WidgetType.Banner4 => "banner4",
-			_ => "shield",
+			_ => "shield"
 		};
 		return $"{Endpoints.BASE_URI}{Endpoints.GUILDS}/{this.Id}{Endpoints.WIDGET_PNG}?style={param}";
 	}
@@ -1716,12 +1725,8 @@ public async Task<DiscordMember> GetMemberAsync(ulong userId, bool fetch = false
 		var intents = this.Discord.Configuration.Intents;
 
 		if (intents.HasIntent(DiscordIntents.GuildMembers))
-		{
 			if (this.MembersInternal != null)
-			{
 				this.MembersInternal[userId] = mbr;
-			}
-		}
 
 		return mbr;
 	}
@@ -1747,7 +1752,10 @@ public async Task<IReadOnlyCollection<DiscordMember>> GetAllMembersAsync()
 
 			foreach (var xtm in tms)
 			{
-				var usr = new DiscordUser(xtm.User) { Discord = this.Discord };
+				var usr = new DiscordUser(xtm.User)
+				{
+					Discord = this.Discord
+				};
 
 				usr = this.Discord.UserCache.AddOrUpdate(xtm.User.Id, usr, (id, old) =>
 				{
@@ -1763,7 +1771,10 @@ public async Task<IReadOnlyCollection<DiscordMember>> GetAllMembersAsync()
 					old.GlobalName = usr.GlobalName;
 					return old;
 				});
-				var mbr = new DiscordMember(xtm) { Discord = this.Discord, GuildId = this.Id };
+				var mbr = new DiscordMember(xtm)
+				{
+					Discord = this.Discord, GuildId = this.Id
+				};
 				recmbr.Add(mbr);
 				if (hasIntent)
 					this.MembersInternal[usr.Id] = mbr;
@@ -1808,8 +1819,7 @@ public async Task RequestMembersAsync(string query = "", int limit = 0, bool? pr
 
 		var payload = new GatewayPayload
 		{
-			OpCode = GatewayOpCode.RequestGuildMembers,
-			Data = grgm
+			OpCode = GatewayOpCode.RequestGuildMembers, Data = grgm
 		};
 
 		var payloadStr = JsonConvert.SerializeObject(payload, Formatting.None);
@@ -1961,7 +1971,6 @@ public async Task<IReadOnlyList<DiscordSticker>> GetStickersAsync()
 		var stickers = await this.Discord.ApiClient.GetGuildStickersAsync(this.Id).ConfigureAwait(false);
 
 		foreach (var xstr in stickers)
-		{
 			this.StickersInternal.AddOrUpdate(xstr.Id, xstr, (id, old) =>
 			{
 				old.Name = xstr.Name;
@@ -1969,7 +1978,6 @@ public async Task<IReadOnlyList<DiscordSticker>> GetStickersAsync()
 				old.InternalTags = xstr.InternalTags;
 				return old;
 			});
-		}
 
 		return stickers;
 	}
@@ -2018,10 +2026,10 @@ public Task<DiscordSticker> CreateStickerAsync(string name, string description,
 		return emoji.Id is not 0
 			? throw new InvalidOperationException("Only unicode emoji can be used for stickers.")
 			: name.Length < 2 || name.Length > 30
-			? throw new ArgumentOutOfRangeException(nameof(name), "Sticker name needs to be between 2 and 30 characters long.")
-			: description.Length < 1 || description.Length > 100
-			? throw new ArgumentOutOfRangeException(nameof(description), "Sticker description needs to be between 1 and 100 characters long.")
-			: this.Discord.ApiClient.CreateGuildStickerAsync(this.Id, name, description, emoji.GetDiscordName().Replace(":", ""), new("sticker", file, null, fileExt, contentType), reason);
+				? throw new ArgumentOutOfRangeException(nameof(name), "Sticker name needs to be between 2 and 30 characters long.")
+				: description.Length < 1 || description.Length > 100
+					? throw new ArgumentOutOfRangeException(nameof(description), "Sticker description needs to be between 1 and 100 characters long.")
+					: this.Discord.ApiClient.CreateGuildStickerAsync(this.Id, name, description, emoji.GetDiscordName().Replace(":", ""), new("sticker", file, null, fileExt, contentType), reason);
 	}
 
 	/// <summary>
@@ -2054,7 +2062,6 @@ public async Task<DiscordSticker> ModifyStickerAsync(ulong sticker, Optional<str
 
 		var usticker = await this.Discord.ApiClient.ModifyGuildStickerAsync(this.Id, sticker, name, description, uemoji, reason).ConfigureAwait(false);
 
-
 		if (this.StickersInternal.TryGetValue(usticker.Id, out var old))
 			this.StickersInternal.TryUpdate(usticker.Id, usticker, old);
 
@@ -2275,7 +2282,42 @@ public async Task<DiscordGuildWelcomeScreen> ModifyWelcomeScreenAsync(Action<Wel
 		action(mdl);
 		return await this.Discord.ApiClient.ModifyGuildWelcomeScreenAsync(this.Id, mdl.Enabled, mdl.WelcomeChannels, mdl.Description).ConfigureAwait(false);
 	}
-	#endregion
+
+	/// <summary>
+	/// Gets audit log entries for this guild.
+	/// </summary>
+	/// <param name="limit">Maximum number of entries to fetch.</param>
+	/// <param name="byMember">Filter by member responsible.</param>
+	/// <param name="actionType">Filter by action type.</param>
+	/// <returns>A collection of requested audit log entries.</returns>
+	/// <exception cref="UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ViewAuditLog"/> permission.</exception>
+	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
+	public async Task<IReadOnlyList<DiscordAuditLog>> GetAuditLogsAsync(int? limit = null, DiscordMember? byMember = null, AuditLogActionType? actionType = null)
+	{
+		var alrs = new List<DiscordAuditLog>();
+		int ac = 1, tc = 0;
+		var last = 0ul;
+		while (ac > 0)
+		{
+			var rmn = limit != null ? limit.Value - tc : 100;
+			rmn = Math.Min(100, rmn);
+			if (rmn <= 0) break;
+
+			var alr = await this.Discord.ApiClient.GetAuditLogsAsync(this.Id, rmn, null, last == 0 ? null : last, byMember?.Id, (int?)actionType).ConfigureAwait(false);
+			ac = alr.Entries.Count;
+			tc += ac;
+			if (ac <= 0)
+				continue;
+
+			last = alr.Entries[^1].Id;
+			alr.Entries.ForEach(x => x.Discord = (DiscordClient)this.Discord);
+			alrs.Add(alr);
+		}
+
+		return alrs;
+	}
+
+#endregion
 
 	/// <summary>
 	/// Returns a string representation of this guild.
@@ -2318,7 +2360,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Guild/DiscordGuildInventorySettings.cs b/DisCatSharp/Entities/Guild/DiscordGuildInventorySettings.cs
index b7b6e3e2b2..7813487cd9 100644
--- a/DisCatSharp/Entities/Guild/DiscordGuildInventorySettings.cs
+++ b/DisCatSharp/Entities/Guild/DiscordGuildInventorySettings.cs
@@ -1,4 +1,3 @@
-
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities;
diff --git a/DisCatSharp/Entities/Guild/DiscordGuildPreview.cs b/DisCatSharp/Entities/Guild/DiscordGuildPreview.cs
index 47bb15d62a..39e171088f 100644
--- a/DisCatSharp/Entities/Guild/DiscordGuildPreview.cs
+++ b/DisCatSharp/Entities/Guild/DiscordGuildPreview.cs
@@ -45,7 +45,7 @@ public string IconUrl
 	/// </summary>
 	[JsonIgnore]
 	public string SplashUrl
-	 => !string.IsNullOrWhiteSpace(this.SplashHash) ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.SPLASHES}/{this.Id.ToString(CultureInfo.InvariantCulture)}/{this.SplashHash}.png?size=1024" : null;
+		=> !string.IsNullOrWhiteSpace(this.SplashHash) ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.SPLASHES}/{this.Id.ToString(CultureInfo.InvariantCulture)}/{this.SplashHash}.png?size=1024" : null;
 
 	/// <summary>
 	/// Gets the guild discovery splash's hash.
@@ -66,8 +66,7 @@ public string DiscoverySplashUrl
 	[JsonIgnore]
 	public IReadOnlyDictionary<ulong, DiscordEmoji> Emojis => new ReadOnlyConcurrentDictionary<ulong, DiscordEmoji>(this.EmojisInternal);
 
-	[JsonProperty("emojis", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("emojis", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordEmoji> EmojisInternal;
 
 	/// <summary>
@@ -76,11 +75,9 @@ public string DiscoverySplashUrl
 	[JsonIgnore]
 	public IReadOnlyDictionary<ulong, DiscordSticker> Stickers => new ReadOnlyConcurrentDictionary<ulong, DiscordSticker>(this.StickersInternal);
 
-	[JsonProperty("stickers", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("stickers", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordSticker> StickersInternal;
 
-
 	/// <summary>
 	/// Gets a collection of this guild's features.
 	/// </summary>
diff --git a/DisCatSharp/Entities/Guild/DiscordMember.cs b/DisCatSharp/Entities/Guild/DiscordMember.cs
index 4809bfec33..8a6072806e 100644
--- a/DisCatSharp/Entities/Guild/DiscordMember.cs
+++ b/DisCatSharp/Entities/Guild/DiscordMember.cs
@@ -135,7 +135,7 @@ public override DiscordColor? BannerColor
 	/// </summary>
 	[JsonIgnore]
 	public string DisplayName
-		=> this.Nickname ?? (this.IsMigrated ? (this.GlobalName ?? this.Username) : this.Username);
+		=> this.Nickname ?? (this.IsMigrated ? this.GlobalName ?? this.Username : this.Username);
 
 	/// <summary>
 	/// List of role ids
@@ -146,6 +146,7 @@ internal IReadOnlyList<ulong> RoleIds
 
 	[JsonProperty("roles", NullValueHandling = NullValueHandling.Ignore)]
 	internal List<ulong> RoleIdsInternal;
+
 	[JsonIgnore]
 	private readonly Lazy<IReadOnlyList<ulong>> _roleIdsLazy;
 
@@ -207,7 +208,6 @@ public bool IsCommunicationDisabled
 	public bool HasUnusualDmActivity
 		=> this.UnusualDmActivityUntil != null && this.UnusualDmActivityUntil.Value.ToUniversalTime() > DateTime.UtcNow;
 
-
 	/// <summary>
 	/// If the user is deafened
 	/// </summary>
@@ -255,7 +255,11 @@ public bool IsOwner
 	/// </summary>
 	[JsonIgnore]
 	public int Hierarchy
-		=> this.IsOwner ? int.MaxValue : this.RoleIds.Count == 0 ? 0 : this.Roles.Max(x => x.Position);
+		=> this.IsOwner
+			? int.MaxValue
+			: this.RoleIds.Count == 0
+				? 0
+				: this.Roles.Max(x => x.Position);
 
 	/// <summary>
 	/// Gets the permissions for the current member.
@@ -270,7 +274,7 @@ public int Hierarchy
 	public Permissions Permissions
 		=> this.InteractionPermissions ?? this.GetPermissions();
 
-	#region Overridden user properties
+#region Overridden user properties
 
 	/// <summary>
 	/// Gets the user.
@@ -433,7 +437,7 @@ public override UserFlags? Flags
 		internal set => this.User.Flags = value;
 	}
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Sets this member's voice mute status.
@@ -491,11 +495,9 @@ await this.Discord.ApiClient.ModifyGuildMemberAsync(this.Guild.Id, this.Id, Opti
 				mdl.VoiceChannel.Map(e => e?.Id), default, this.MemberFlags, mdl.AuditLogReason).ConfigureAwait(false);
 		}
 		else
-		{
 			await this.Discord.ApiClient.ModifyGuildMemberAsync(this.Guild.Id, this.Id, mdl.Nickname,
 				mdl.Roles.Map(e => e.Select(xr => xr.Id)), mdl.Muted, mdl.Deafened,
 				mdl.VoiceChannel.Map(e => e?.Id), default, this.MemberFlags, mdl.AuditLogReason).ConfigureAwait(false);
-		}
 	}
 
 	/// <summary>
@@ -731,7 +733,7 @@ public override bool Equals(object obj)
 	/// <param name="e"><see cref="DiscordMember"/> to compare to.</param>
 	/// <returns>Whether the <see cref="DiscordMember"/> is equal to this <see cref="DiscordMember"/>.</returns>
 	public bool Equals(DiscordMember e)
-		=> e is not null && (ReferenceEquals(this, e) || (this.Id == e.Id && this.GuildId == e.GuildId));
+		=> e is not null && (ReferenceEquals(this, e) || this.Id == e.Id && this.GuildId == e.GuildId);
 
 	/// <summary>
 	/// Gets the hash code for this <see cref="DiscordMember"/>.
@@ -741,8 +743,8 @@ public override int GetHashCode()
 	{
 		var hash = 13;
 
-		hash = (hash * 7) + this.Id.GetHashCode();
-		hash = (hash * 7) + this.GuildId.GetHashCode();
+		hash = hash * 7 + this.Id.GetHashCode();
+		hash = hash * 7 + this.GuildId.GetHashCode();
 
 		return hash;
 	}
@@ -758,7 +760,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || (e1.Id == e2.Id && e1.GuildId == e2.GuildId));
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id && e1.GuildId == e2.GuildId);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Guild/DiscordRole.cs b/DisCatSharp/Entities/Guild/DiscordRole.cs
index 6381e8846d..5b9a511bac 100644
--- a/DisCatSharp/Entities/Guild/DiscordRole.cs
+++ b/DisCatSharp/Entities/Guild/DiscordRole.cs
@@ -148,7 +148,7 @@ public string Mention
 	public IReadOnlyList<KeyValuePair<ulong, DiscordMember>> Members
 		=> this.Guild.Members.Where(x => x.Value.RoleIds.Any(x => x == this.Id)).ToList();
 
-	#region Methods
+#region Methods
 
 	/// <summary>
 	/// Modifies this role's position.
@@ -168,7 +168,9 @@ public Task ModifyPositionAsync(int position, string reason = null)
 				RoleId = x.Id,
 				Position = x.Id == this.Id
 					? position
-					: x.Position <= position ? x.Position - 1 : x.Position
+					: x.Position <= position
+						? x.Position - 1
+						: x.Position
 			});
 
 		return this.Discord.ApiClient.ModifyGuildRolePositionAsync(this.GuildId, roles, reason);
@@ -194,44 +196,33 @@ public Task ModifyAsync(string name = null, Permissions? permissions = null, Dis
 	/// Updates this role.
 	/// </summary>
 	/// <param name="action">The action.</param>
-	/// <exception cref = "Exceptions.UnauthorizedException" > Thrown when the client does not have the<see cref="Permissions.ManageRoles"/> permission.</exception>
+	/// <exception cref="UnauthorizedException"> Thrown when the client does not have the<see cref="Permissions.ManageRoles"/> permission.</exception>
 	/// <exception cref="NotFoundException">Thrown when the role does not exist.</exception>
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
+	/// <exception cref="Exception">A delegate callback throws an exception.</exception>
 	public Task ModifyAsync(Action<RoleEditModel> action)
 	{
 		var mdl = new RoleEditModel();
 		action(mdl);
 
 		var canContinue = true;
-		if ((mdl.Icon.HasValue && mdl.Icon.Value != null) || (mdl.UnicodeEmoji.HasValue && mdl.UnicodeEmoji.Value != null))
+		if (mdl.Icon is { HasValue: true, Value: not null } || mdl.UnicodeEmoji is { HasValue: true, Value: not null })
 			canContinue = this.Guild.Features.HasFeature(GuildFeaturesEnum.CanSetRoleIcons);
 
-		var iconb64 = Optional.FromNullable<string>(null);
-		if (mdl.Icon.HasValue && mdl.Icon.Value != null)
-			iconb64 = ImageTool.Base64FromStream(mdl.Icon);
-		else if (mdl.Icon.HasValue)
-			iconb64 = Optional.Some<string?>(null);
-		else
-			iconb64 = Optional.None;
-
-		var emoji = Optional.FromNullable<string?>(null);
+		var iconb64 = mdl.Icon.HasValue switch
+		{
+			true when mdl.Icon.Value != null => ImageTool.Base64FromStream(mdl.Icon),
+			true => Optional.Some<string?>(null),
+			_ => (Optional<string>)Optional.None
+		};
 
-		switch (mdl.UnicodeEmoji.HasValue)
+		var emoji = mdl.UnicodeEmoji.HasValue switch
 		{
-			case true when mdl.UnicodeEmoji.Value != null:
-				emoji = mdl.UnicodeEmoji
-					.MapOrNull(e => e.Id == 0
-						? e.Name
-						: throw new ArgumentException("Emoji must be unicode"));
-				break;
-			case true:
-				emoji = Optional.Some<string?>(null);
-				break;
-			case false:
-				emoji = Optional.None;
-				break;
-		}
+			true when mdl.UnicodeEmoji.Value != null => mdl.UnicodeEmoji.MapOrNull(e => e.Id == 0 ? e.Name : throw new ArgumentException("Emoji must be unicode")),
+			true => Optional.Some<string?>(null),
+			false => Optional.None
+		};
 
 		return canContinue ? this.Discord.ApiClient.ModifyGuildRoleAsync(this.GuildId, this.Id, mdl.Name, mdl.Permissions, mdl.Color?.Value, mdl.Hoist, mdl.Mentionable, iconb64, emoji, mdl.AuditLogReason) : throw new NotSupportedException($"Cannot modify role icon. Guild needs boost tier two.");
 	}
@@ -248,7 +239,7 @@ public Task ModifyAsync(Action<RoleEditModel> action)
 	public Task DeleteAsync(string reason = null)
 		=> this.Discord.ApiClient.DeleteRoleAsync(this.GuildId, this.Id, reason);
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="DiscordRole"/> class.
@@ -306,7 +297,7 @@ public override int GetHashCode()
 	/// <returns>Whether the two roles are equal.</returns>
 	public static bool operator ==(DiscordRole e1, DiscordRole e2)
 		=> e1 is null == e2 is null
-		&& ((e1 is null && e2 is null) || e1.Id == e2.Id);
+		   && (e1 is null && e2 is null || e1.Id == e2.Id);
 
 	/// <summary>
 	/// Gets whether the two <see cref="DiscordRole"/> objects are not equal.
diff --git a/DisCatSharp/Entities/Guild/DiscordRoleTags.cs b/DisCatSharp/Entities/Guild/DiscordRoleTags.cs
index 86961458e5..36cddbd409 100644
--- a/DisCatSharp/Entities/Guild/DiscordRoleTags.cs
+++ b/DisCatSharp/Entities/Guild/DiscordRoleTags.cs
@@ -25,6 +25,7 @@ public class DiscordRoleTags : ObservableApiObject
 	[JsonIgnore]
 	public bool IsPremiumSubscriber
 		=> this.PremiumSubscriber.HasValue && this.PremiumSubscriber.Value;
+
 	[JsonProperty("premium_subscriber", NullValueHandling = NullValueHandling.Include)]
 	internal bool? PremiumSubscriber = false;
 
diff --git a/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboarding.cs b/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboarding.cs
index 4f5cf6ff96..6e2c4606e8 100644
--- a/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboarding.cs
+++ b/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboarding.cs
@@ -58,6 +58,9 @@ public DiscordGuild Guild
 	/// Constructs a new onboarding configuration.
 	/// </summary>
 	internal DiscordOnboarding()
-		:base(new() { "responses", "onboarding_prompts_seen", "onboarding_responses_seen" })
+		: base(new()
+		{
+			"responses", "onboarding_prompts_seen", "onboarding_responses_seen"
+		})
 	{ }
 }
diff --git a/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboardingPrompt.cs b/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboardingPrompt.cs
index 0c97c188fd..a4c5f57074 100644
--- a/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboardingPrompt.cs
+++ b/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboardingPrompt.cs
@@ -56,9 +56,14 @@ public sealed class DiscordOnboardingPrompt : SnowflakeObject
 	/// <param name="required">Whether the prompt is required. Defaults to <see langword="true"/>.</param>
 	/// <param name="inOnboarding">Whether the prompt is shown in onboarding. Defaults to <see langword="true"/>.</param>
 	/// <param name="type">The prompt type. Defaults to <see cref="PromptType.MultipleChoice"/>.</param>
-	public DiscordOnboardingPrompt(string title, List<DiscordOnboardingPromptOption> options,
-		bool singleSelect = false, bool required = true,
-		bool inOnboarding = true, PromptType type = PromptType.MultipleChoice)
+	public DiscordOnboardingPrompt(
+		string title,
+		List<DiscordOnboardingPromptOption> options,
+		bool singleSelect = false,
+		bool required = true,
+		bool inOnboarding = true,
+		PromptType type = PromptType.MultipleChoice
+	)
 	{
 		this.Title = title;
 		this.Options = options;
diff --git a/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboardingPromptOption.cs b/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboardingPromptOption.cs
index 95bc016f80..570ec980c0 100644
--- a/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboardingPromptOption.cs
+++ b/DisCatSharp/Entities/Guild/Onboarding/DiscordOnboardingPromptOption.cs
@@ -32,7 +32,7 @@ public sealed class DiscordOnboardingPromptOption : SnowflakeObject
 	/// </summary>
 	[JsonProperty("role_ids", NullValueHandling = NullValueHandling.Ignore)]
 	public List<ulong>? RoleIds { get; internal set; }
-	
+
 	/// <summary>
 	/// Gets the option's channel ids.
 	/// </summary>
@@ -48,8 +48,13 @@ public sealed class DiscordOnboardingPromptOption : SnowflakeObject
 	/// <param name="emoji">The emoji. Defaults to <see langword="null"/>.</param>
 	/// <param name="roleIds">The role ids. Defaults to <see langword="null"/>.</param>
 	/// <param name="channelIds">The channel ids. Defaults to <see langword="null"/>.</param>
-	public DiscordOnboardingPromptOption(string title, string? description = null,
-		DiscordEmoji? emoji = null, List<ulong>? roleIds = null, List<ulong>? channelIds = null)
+	public DiscordOnboardingPromptOption(
+		string title,
+		string? description = null,
+		DiscordEmoji? emoji = null,
+		List<ulong>? roleIds = null,
+		List<ulong>? channelIds = null
+	)
 	{
 		this.Title = title;
 		this.Description = description;
diff --git a/DisCatSharp/Entities/Guild/Onboarding/DiscordServerGuide.cs b/DisCatSharp/Entities/Guild/Onboarding/DiscordServerGuide.cs
index 91eac9cd11..acd511494c 100644
--- a/DisCatSharp/Entities/Guild/Onboarding/DiscordServerGuide.cs
+++ b/DisCatSharp/Entities/Guild/Onboarding/DiscordServerGuide.cs
@@ -1,4 +1,3 @@
-
 using System.Collections.Generic;
 
 using Newtonsoft.Json;
diff --git a/DisCatSharp/Entities/Guild/Onboarding/WelcomeMessage.cs b/DisCatSharp/Entities/Guild/Onboarding/WelcomeMessage.cs
index 89fe92fed8..98baaad92b 100644
--- a/DisCatSharp/Entities/Guild/Onboarding/WelcomeMessage.cs
+++ b/DisCatSharp/Entities/Guild/Onboarding/WelcomeMessage.cs
@@ -38,7 +38,10 @@ public ulong AuthorId
 	/// <param name="message">The message. Use <c>[@username]</c> to mention the new member. Required.</param>
 	public WelcomeMessage(ulong authorId, string message)
 	{
-		this.AuthorIds = new() { authorId };
+		this.AuthorIds = new()
+		{
+			authorId
+		};
 		this.Message = message;
 	}
 
diff --git a/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEvent.cs b/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEvent.cs
index 8f0cab38d8..af74c3e9d7 100644
--- a/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEvent.cs
+++ b/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEvent.cs
@@ -93,8 +93,7 @@ public string CoverImageUrl
 	/// </summary>
 	[JsonIgnore]
 	public DateTimeOffset? ScheduledStartTime
-		=> !string.IsNullOrWhiteSpace(this.ScheduledStartTimeRaw) && DateTimeOffset.TryParse(this.ScheduledStartTimeRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
-			dto : null;
+		=> !string.IsNullOrWhiteSpace(this.ScheduledStartTimeRaw) && DateTimeOffset.TryParse(this.ScheduledStartTimeRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ? dto : null;
 
 	/// <summary>
 	/// Gets the scheduled start time of the scheduled event as raw string.
@@ -107,8 +106,7 @@ public DateTimeOffset? ScheduledStartTime
 	/// </summary>
 	[JsonIgnore]
 	public DateTimeOffset? ScheduledEndTime
-		=> !string.IsNullOrWhiteSpace(this.ScheduledEndTimeRaw) && DateTimeOffset.TryParse(this.ScheduledEndTimeRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
-			dto : null;
+		=> !string.IsNullOrWhiteSpace(this.ScheduledEndTimeRaw) && DateTimeOffset.TryParse(this.ScheduledEndTimeRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ? dto : null;
 
 	/// <summary>
 	/// Gets the scheduled end time of the scheduled event as raw string.
@@ -159,11 +157,13 @@ public DateTimeOffset? ScheduledEndTime
 	/// Initializes a new instance of the <see cref="DiscordScheduledEvent"/> class.
 	/// </summary>
 	internal DiscordScheduledEvent()
-		: base(new() { "sku_ids" })
+		: base(new()
+		{
+			"sku_ids"
+		})
 	{ }
 
-	#region Methods
-
+#region Methods
 
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
@@ -196,7 +196,6 @@ public async Task ModifyAsync(Action<ScheduledEventEditModel> action)
 		await this.Discord.ApiClient.ModifyGuildScheduledEventAsync(this.GuildId, this.Id, channelId, this.EntityType == ScheduledEventEntityType.External ? new DiscordScheduledEventEntityMetadata(mdl.Location.Value) : null, mdl.Name, mdl.ScheduledStartTime, scheduledEndTime, mdl.Description, mdl.EntityType, mdl.Status, coverb64, mdl.AuditLogReason).ConfigureAwait(false);
 	}
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Starts the current scheduled event.
@@ -209,7 +208,6 @@ public async Task<DiscordScheduledEvent> StartAsync(string reason = null)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Status == ScheduledEventStatus.Scheduled ? await this.Discord.ApiClient.ModifyGuildScheduledEventStatusAsync(this.GuildId, this.Id, ScheduledEventStatus.Active, reason).ConfigureAwait(false) : throw new InvalidOperationException("You can only start scheduled events");
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Cancels the current scheduled event.
@@ -223,7 +221,6 @@ public async Task<DiscordScheduledEvent> CancelAsync(string reason = null)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Status == ScheduledEventStatus.Scheduled ? await this.Discord.ApiClient.ModifyGuildScheduledEventStatusAsync(this.GuildId, this.Id, ScheduledEventStatus.Canceled, reason).ConfigureAwait(false) : throw new InvalidOperationException("You can only cancel scheduled events");
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Ends the current scheduled event.
@@ -237,7 +234,6 @@ public async Task<DiscordScheduledEvent> EndAsync(string reason = null)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Status == ScheduledEventStatus.Active ? await this.Discord.ApiClient.ModifyGuildScheduledEventStatusAsync(this.GuildId, this.Id, ScheduledEventStatus.Completed, reason).ConfigureAwait(false) : throw new InvalidOperationException("You can only stop active events");
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Gets a list of users RSVP'd to the scheduled event.
@@ -254,7 +250,6 @@ public async Task<IReadOnlyDictionary<ulong, DiscordScheduledEventUser>> GetUser
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> await this.Discord.ApiClient.GetGuildScheduledEventRspvUsersAsync(this.GuildId, this.Id, limit, before, after, withMember).ConfigureAwait(false);
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Deletes a scheduled event.
@@ -268,7 +263,7 @@ public async Task DeleteAsync(string reason = null)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> await this.Discord.ApiClient.DeleteGuildScheduledEventAsync(this.GuildId, this.Id, reason).ConfigureAwait(false);
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Checks whether this <see cref="DiscordScheduledEvent"/> is equal to another object.
@@ -304,7 +299,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEventEntityMetadata.cs b/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEventEntityMetadata.cs
index 89b71a37e0..9653751909 100644
--- a/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEventEntityMetadata.cs
+++ b/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEventEntityMetadata.cs
@@ -9,7 +9,6 @@ namespace DisCatSharp.Entities;
 /// </summary>
 public class DiscordScheduledEventEntityMetadata : ObservableApiObject
 {
-
 	/// <summary>
 	/// External location if event type is <see cref="ScheduledEventEntityType.External"/>.
 	/// </summary>
diff --git a/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEventUser.cs b/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEventUser.cs
index 3546da29fd..29f29580c6 100644
--- a/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEventUser.cs
+++ b/DisCatSharp/Entities/Guild/ScheduledEvent/DiscordScheduledEventUser.cs
@@ -87,7 +87,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || HashCode.Combine(e1.User.Id, e1.EventId) == HashCode.Combine(e2.User.Id, e2.EventId));
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || HashCode.Combine(e1.User.Id, e1.EventId) == HashCode.Combine(e2.User.Id, e2.EventId));
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Guild/Stage/DiscordStageInstance.cs b/DisCatSharp/Entities/Guild/Stage/DiscordStageInstance.cs
index 4fa2dd93bb..0107d82a07 100644
--- a/DisCatSharp/Entities/Guild/Stage/DiscordStageInstance.cs
+++ b/DisCatSharp/Entities/Guild/Stage/DiscordStageInstance.cs
@@ -76,7 +76,7 @@ public bool Equals(DiscordStageInstance e)
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannel.cs b/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannel.cs
index 505423b0da..dc3c05f4b9 100644
--- a/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannel.cs
+++ b/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannel.cs
@@ -65,8 +65,7 @@ public class DiscordThreadChannel : DiscordChannel
 	[JsonIgnore]
 	public IReadOnlyDictionary<ulong, DiscordThreadChannelMember> ThreadMembers => new ReadOnlyConcurrentDictionary<ulong, DiscordThreadChannelMember>(this.ThreadMembersInternal);
 
-	[JsonProperty("thread_member", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("thread_member", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordThreadChannelMember> ThreadMembersInternal;
 
 	/// <summary>
@@ -94,10 +93,13 @@ public IReadOnlyList<ForumPostTag> AppliedTags
 	/// Initializes a new instance of the <see cref="DiscordThreadChannel"/> class.
 	/// </summary>
 	internal DiscordThreadChannel()
-		: base(new() { "hashes", "guild_hashes" })
+		: base(new()
+		{
+			"hashes", "guild_hashes"
+		})
 	{ }
 
-	#region Methods
+#region Methods
 
 	/// <summary>
 	/// Modifies the current thread.
@@ -128,9 +130,12 @@ public Task ModifyAsync(Action<ThreadEditModel> action)
 	/// <exception cref="BadRequestException">Thrown when an invalid parameter was provided.</exception>
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public Task AddTagAsync(ForumPostTag tag, string reason = null)
-		=> this.AppliedTagIds.Count == 5 ?
-			throw new NotSupportedException("Cannot have more than 5 applied tags.") :
-			this.Discord.ApiClient.ModifyThreadAsync(this.Id, this.Parent.Type, null, null, null, null, null, null, new List<ForumPostTag>(this.AppliedTags) { tag }, null, reason);
+		=> this.AppliedTagIds.Count == 5
+			? throw new NotSupportedException("Cannot have more than 5 applied tags.")
+			: this.Discord.ApiClient.ModifyThreadAsync(this.Id, this.Parent.Type, null, null, null, null, null, null, new List<ForumPostTag>(this.AppliedTags)
+			{
+				tag
+			}, null, reason);
 
 	/// <summary>
 	/// Remove a tag from the current thread.
@@ -188,7 +193,6 @@ public Task LockAsync(string reason = null)
 	public Task UnlockAsync(string reason = null)
 		=> this.Discord.ApiClient.ModifyThreadAsync(this.Id, this.Parent.Type, null, false, true, null, null, null, null, null, reason);
 
-
 	/// <summary>
 	/// Gets the members of a thread. Needs the <see cref="DiscordIntents.GuildMembers"/> intent.
 	/// </summary>
@@ -232,7 +236,6 @@ public Task AddMemberAsync(DiscordMember member)
 	public Task<DiscordThreadChannelMember> GetMemberAsync(ulong memberId, bool withMember = false)
 		=> this.Discord.ApiClient.GetThreadMemberAsync(this.Id, memberId, withMember);
 
-
 	/// <summary>
 	/// Tries to get a member in this thread.
 	/// </summary>
@@ -315,9 +318,7 @@ public async Task AddRoleAsync(ulong roleId)
 		var members = await this.Guild.GetAllMembersAsync().ConfigureAwait(false);
 		var roleMembers = members.Where(m => m.Roles.Contains(role));
 		foreach (var member in roleMembers)
-		{
 			await this.Discord.ApiClient.AddThreadMemberAsync(this.Id, member.Id).ConfigureAwait(false);
-		}
 	}
 
 	/// <summary>
@@ -343,9 +344,7 @@ public async Task RemoveRoleAsync(ulong roleId)
 		var members = await this.Guild.GetAllMembersAsync().ConfigureAwait(false);
 		var roleMembers = members.Where(m => m.Roles.Contains(role));
 		foreach (var member in roleMembers)
-		{
 			await this.Discord.ApiClient.RemoveThreadMemberAsync(this.Id, member.Id).ConfigureAwait(false);
-		}
 	}
 
 	/// <summary>
@@ -388,7 +387,8 @@ public override string ToString()
 			ChannelType.NewsThread => $"News thread {this.Name} ({this.Id})",
 			ChannelType.PublicThread => $"Thread {this.Name} ({this.Id})",
 			ChannelType.PrivateThread => $"Private thread {this.Name} ({this.Id})",
-			_ => $"Thread {this.Name} ({this.Id})",
+			_ => $"Thread {this.Name} ({this.Id})"
 		};
-	#endregion
+
+#endregion
 }
diff --git a/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannelMember.cs b/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannelMember.cs
index 45eec812db..b7d863e5df 100644
--- a/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannelMember.cs
+++ b/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannelMember.cs
@@ -35,8 +35,7 @@ public class DiscordThreadChannelMember : SnowflakeObject, IEquatable<DiscordThr
 	/// </summary>
 	[JsonIgnore]
 	public DateTimeOffset? JoinTimeStamp
-		=> !string.IsNullOrWhiteSpace(this.JoinTimeStampRaw) && DateTimeOffset.TryParse(this.JoinTimeStampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
-			dto : null;
+		=> !string.IsNullOrWhiteSpace(this.JoinTimeStampRaw) && DateTimeOffset.TryParse(this.JoinTimeStampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ? dto : null;
 
 	/// <summary>
 	/// Gets the timestamp when the user joined the thread as raw string.
@@ -81,7 +80,7 @@ public override bool Equals(object obj)
 	/// <param name="e"><see cref="DiscordThreadChannel"/> to compare to.</param>
 	/// <returns>Whether the <see cref="DiscordThreadChannel"/> is equal to this <see cref="DiscordThreadChannelMember"/>.</returns>
 	public bool Equals(DiscordThreadChannelMember e)
-		=> e is not null && (ReferenceEquals(this, e) || (this.Id == e.Id && this.UserId == e.UserId));
+		=> e is not null && (ReferenceEquals(this, e) || this.Id == e.Id && this.UserId == e.UserId);
 
 	/// <summary>
 	/// Gets the hash code for this <see cref="DiscordThreadChannelMember"/>.
@@ -101,7 +100,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || (e1.Id == e2.Id && e1.UserId == e2.UserId));
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id && e1.UserId == e2.UserId);
 	}
 
 	/// <summary>
@@ -117,6 +116,9 @@ public override int GetHashCode()
 	/// Initializes a new instance of the <see cref="DiscordThreadChannelMember"/> class.
 	/// </summary>
 	internal DiscordThreadChannelMember()
-		: base(new() { "muted", "mute_config", "guild_id" })
+		: base(new()
+		{
+			"muted", "mute_config", "guild_id"
+		})
 	{ }
 }
diff --git a/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannelMetadata.cs b/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannelMetadata.cs
index efc53ba44f..ae028037a9 100644
--- a/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannelMetadata.cs
+++ b/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadChannelMetadata.cs
@@ -35,8 +35,7 @@ public class DiscordThreadChannelMetadata : ObservableApiObject
 	/// </summary>
 	[JsonIgnore]
 	public DateTimeOffset? ArchiveTimestamp
-		=> !string.IsNullOrWhiteSpace(this.ArchiveTimestampRaw) && DateTimeOffset.TryParse(this.ArchiveTimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
-			dto : null;
+		=> !string.IsNullOrWhiteSpace(this.ArchiveTimestampRaw) && DateTimeOffset.TryParse(this.ArchiveTimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ? dto : null;
 
 	/// <summary>
 	/// Gets the timestamp when it was archived as raw string.
@@ -62,8 +61,7 @@ public DateTimeOffset? ArchiveTimestamp
 	/// </summary>
 	[JsonIgnore]
 	public DateTimeOffset? CreateTimestamp
-		=> !string.IsNullOrWhiteSpace(this.CreateTimestampRaw) && DateTimeOffset.TryParse(this.CreateTimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
-			dto : null;
+		=> !string.IsNullOrWhiteSpace(this.CreateTimestampRaw) && DateTimeOffset.TryParse(this.CreateTimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ? dto : null;
 
 	/// <summary>
 	/// Gets the timestamp when the thread was created as raw string.
diff --git a/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadResult.cs b/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadResult.cs
index 14a2d06c4a..53d8b6e67e 100644
--- a/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadResult.cs
+++ b/DisCatSharp/Entities/Guild/ThreadAndForum/DiscordThreadResult.cs
@@ -15,7 +15,13 @@ public class DiscordThreadResult : ObservableApiObject
 	/// </summary>
 	[JsonIgnore]
 	public Dictionary<ulong, DiscordThreadChannel> ReturnedThreads
-		=> this.Threads == null || !this.Threads.Any() ? new() : this.Threads.Select(t => new { t.Id, t }).ToDictionary(t => t.Id, t => t.t);
+		=> this.Threads == null || !this.Threads.Any()
+			? new()
+			: this.Threads.Select(t => new
+			{
+				t.Id, t
+			}).ToDictionary(t => t.Id, t => t.t);
+
 	[JsonProperty("threads", NullValueHandling = NullValueHandling.Ignore)]
 	internal List<DiscordThreadChannel> Threads { get; set; }
 
diff --git a/DisCatSharp/Entities/Guild/ThreadAndForum/ForumPostTag.cs b/DisCatSharp/Entities/Guild/ThreadAndForum/ForumPostTag.cs
index f51d982874..4ab0d7cd05 100644
--- a/DisCatSharp/Entities/Guild/ThreadAndForum/ForumPostTag.cs
+++ b/DisCatSharp/Entities/Guild/ThreadAndForum/ForumPostTag.cs
@@ -43,7 +43,6 @@ public class ForumPostTag : NullableSnowflakeObject, IEquatable<ForumPostTag>
 	[JsonProperty("emoji_name", NullValueHandling = NullValueHandling.Include)]
 	public string? UnicodeEmojiString { get; internal set; }
 
-
 	/// <summary>
 	/// Gets whether the tag can only be used by moderators.
 	/// </summary>
@@ -122,7 +121,7 @@ public override bool Equals(object obj)
 	/// <param name="e"><see cref="ForumPostTag"/> to compare to.</param>
 	/// <returns>Whether the <see cref="ForumPostTag"/> is equal to this <see cref="ForumPostTag"/>.</returns>
 	public bool Equals(ForumPostTag e)
-		=> e is not null && (ReferenceEquals(this, e) || (this.Id == e.Id && this.Name == e.Name));
+		=> e is not null && (ReferenceEquals(this, e) || this.Id == e.Id && this.Name == e.Name);
 
 	/// <summary>
 	/// Gets the hash code for this <see cref="ForumPostTag"/>.
@@ -142,7 +141,7 @@ public override int GetHashCode()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Guild/ThreadAndForum/ForumReactionEmoji.cs b/DisCatSharp/Entities/Guild/ThreadAndForum/ForumReactionEmoji.cs
index 978183626e..743780a435 100644
--- a/DisCatSharp/Entities/Guild/ThreadAndForum/ForumReactionEmoji.cs
+++ b/DisCatSharp/Entities/Guild/ThreadAndForum/ForumReactionEmoji.cs
@@ -33,5 +33,4 @@ public ForumReactionEmoji(ulong? emojiId = null, string unicodeEmojiString = nul
 	/// </summary>
 	public DiscordEmoji GetEmoji(DiscordClient client)
 		=> this.EmojiName != null ? DiscordEmoji.FromName(client, $":{this.EmojiName}:", false) : DiscordEmoji.FromGuildEmote(client, this.EmojiId.Value);
-
 }
diff --git a/DisCatSharp/Entities/Interaction/Components/Button/DiscordButtonComponent.cs b/DisCatSharp/Entities/Interaction/Components/Button/DiscordButtonComponent.cs
index 13e5f19037..39b56e7a23 100644
--- a/DisCatSharp/Entities/Interaction/Components/Button/DiscordButtonComponent.cs
+++ b/DisCatSharp/Entities/Interaction/Components/Button/DiscordButtonComponent.cs
@@ -105,6 +105,7 @@ public DiscordButtonComponent(ButtonStyle style, string customId = null, string
 			this.Label = label ?? throw new ArgumentException("Label can only be null if emoji is set.");
 			this.Emoji = null;
 		}
+
 		this.Type = ComponentType.Button;
 	}
 }
diff --git a/DisCatSharp/Entities/Interaction/Components/DiscordEmojiComponent.cs b/DisCatSharp/Entities/Interaction/Components/DiscordEmojiComponent.cs
index ef684fac13..62d1aa5150 100644
--- a/DisCatSharp/Entities/Interaction/Components/DiscordEmojiComponent.cs
+++ b/DisCatSharp/Entities/Interaction/Components/DiscordEmojiComponent.cs
@@ -43,6 +43,7 @@ public DiscordComponentEmoji(string name)
 	{
 		if (!DiscordEmoji.IsValidUnicode(name))
 			throw new ArgumentException("Only unicode emojis can be passed.");
+
 		this.Name = name;
 	}
 
diff --git a/DisCatSharp/Entities/Interaction/Components/Select/DiscordBaseSelectComponent.cs b/DisCatSharp/Entities/Interaction/Components/Select/DiscordBaseSelectComponent.cs
index 66654d2ded..e5a13f53db 100644
--- a/DisCatSharp/Entities/Interaction/Components/Select/DiscordBaseSelectComponent.cs
+++ b/DisCatSharp/Entities/Interaction/Components/Select/DiscordBaseSelectComponent.cs
@@ -62,7 +62,8 @@ public class DiscordBaseSelectComponent : DiscordComponent
 	internal DiscordBaseSelectComponent(ComponentType type, string placeholder, string customId = null, int minOptions = 1, int maxOptions = 1, bool disabled = false, IEnumerable<DiscordSelectDefaultValue>? defaultValues = null)
 	{
 		this.Type = type;
-		this.CustomId = customId ?? Guid.NewGuid().ToString(); ;
+		this.CustomId = customId ?? Guid.NewGuid().ToString();
+		;
 		this.Disabled = disabled;
 		this.Placeholder = placeholder;
 		this.MinimumSelectedValues = minOptions;
@@ -80,6 +81,7 @@ internal DiscordBaseSelectComponent(ComponentType type, string placeholder, stri
 			if (type == ComponentType.RoleSelect && defaultValues.Any(x => x.Type != "role"))
 				throw new ArgumentException("The default values for a role select menus must be of type role.", nameof(defaultValues));
 		}
+
 		this.DefaultValues = defaultValues?.ToList();
 	}
 
@@ -98,7 +100,8 @@ internal DiscordBaseSelectComponent(ComponentType type, string label, string pla
 	{
 		this.Type = type;
 		this.Label = label;
-		this.CustomId = customId ?? Guid.NewGuid().ToString(); ;
+		this.CustomId = customId ?? Guid.NewGuid().ToString();
+		;
 		this.Disabled = disabled;
 		this.Placeholder = placeholder;
 		this.MinimumSelectedValues = minOptions;
@@ -116,11 +119,10 @@ internal DiscordBaseSelectComponent(ComponentType type, string label, string pla
 			if (type == ComponentType.RoleSelect && defaultValues.Any(x => x.Type != "role"))
 				throw new ArgumentException("The default values for a role select menus must be of type role.", nameof(defaultValues));
 		}
+
 		this.DefaultValues = defaultValues?.ToList();
 	}
 
 	internal DiscordBaseSelectComponent()
-	{
-
-	}
+	{ }
 }
diff --git a/DisCatSharp/Entities/Interaction/Components/Select/DiscordChannelSelectComponent.cs b/DisCatSharp/Entities/Interaction/Components/Select/DiscordChannelSelectComponent.cs
index 050ebc8404..132f98e51c 100644
--- a/DisCatSharp/Entities/Interaction/Components/Select/DiscordChannelSelectComponent.cs
+++ b/DisCatSharp/Entities/Interaction/Components/Select/DiscordChannelSelectComponent.cs
@@ -52,7 +52,7 @@ public DiscordChannelSelectComponent Disable()
 	/// <param name="disabled">Whether this select component should be initialized as being disabled. User sees a greyed out select component that cannot be interacted with.</param>
 	/// <param name="defaultValues">The default values of this select menu.</param>
 	public DiscordChannelSelectComponent(string placeholder, IEnumerable<ChannelType> channelTypes = null, string customId = null, int minOptions = 1, int maxOptions = 1, bool disabled = false, IEnumerable<DiscordSelectDefaultValue>? defaultValues = null)
-	: base(ComponentType.ChannelSelect, placeholder, customId, minOptions, maxOptions, disabled, defaultValues)
+		: base(ComponentType.ChannelSelect, placeholder, customId, minOptions, maxOptions, disabled, defaultValues)
 	{
 		this.ChannelTypes = channelTypes?.ToArray() ?? Array.Empty<ChannelType>();
 	}
diff --git a/DisCatSharp/Entities/Interaction/Components/Select/DiscordSelectDefaultValue.cs b/DisCatSharp/Entities/Interaction/Components/Select/DiscordSelectDefaultValue.cs
index 95d6fd5d6f..b74bf85113 100644
--- a/DisCatSharp/Entities/Interaction/Components/Select/DiscordSelectDefaultValue.cs
+++ b/DisCatSharp/Entities/Interaction/Components/Select/DiscordSelectDefaultValue.cs
@@ -66,6 +66,5 @@ public DiscordSelectDefaultValue(DiscordChannel channel)
 	/// Constructs a new <see cref="DiscordSelectDefaultValue"/> for a channel.
 	/// </summary>
 	internal DiscordSelectDefaultValue()
-	{
-	}
+	{ }
 }
diff --git a/DisCatSharp/Entities/Interaction/DiscordFollowupMessageBuilder.cs b/DisCatSharp/Entities/Interaction/DiscordFollowupMessageBuilder.cs
index 110cd23e3c..d5a46d1e10 100644
--- a/DisCatSharp/Entities/Interaction/DiscordFollowupMessageBuilder.cs
+++ b/DisCatSharp/Entities/Interaction/DiscordFollowupMessageBuilder.cs
@@ -27,6 +27,7 @@ public bool IsEphemeral
 			this.FlagsChanged = true;
 		}
 	}
+
 	private bool EPH { get; set; }
 
 	/// <summary>
@@ -41,6 +42,7 @@ public bool EmbedsSuppressed
 			this.FlagsChanged = true;
 		}
 	}
+
 	private bool EMB_SUP { get; set; }
 
 	/// <summary>
@@ -55,6 +57,7 @@ public bool NotificationsSuppressed
 			this.FlagsChanged = true;
 		}
 	}
+
 	private bool NOTI_SUP { get; set; }
 
 	/// <summary>
@@ -72,35 +75,40 @@ public string Content
 		{
 			if (value != null && value.Length > 2000)
 				throw new ArgumentException("Content length cannot exceed 2000 characters.", nameof(value));
+
 			this._content = value;
 		}
 	}
+
 	private string _content;
 
 	/// <summary>
 	/// Embeds to send on followup message.
 	/// </summary>
 	public IReadOnlyList<DiscordEmbed> Embeds => this._embeds;
+
 	private readonly List<DiscordEmbed> _embeds = new();
 
 	/// <summary>
 	/// Files to send on this followup message.
 	/// </summary>
 	public IReadOnlyList<DiscordMessageFile> Files => this._files;
+
 	private readonly List<DiscordMessageFile> _files = new();
 
 	/// <summary>
 	/// Components to send on this followup message.
 	/// </summary>
 	public IReadOnlyList<DiscordActionRowComponent> Components => this._components;
+
 	private readonly List<DiscordActionRowComponent> _components = new();
 
 	/// <summary>
 	/// Mentions to send on this followup message.
 	/// </summary>
 	public IReadOnlyList<IMention> Mentions => this._mentions;
-	private readonly List<IMention> _mentions = new();
 
+	private readonly List<IMention> _mentions = new();
 
 	/// <summary>
 	/// Appends a collection of components to the message.
@@ -147,6 +155,7 @@ public DiscordFollowupMessageBuilder AddComponents(IEnumerable<DiscordComponent>
 		this._components.Add(arc);
 		return this;
 	}
+
 	/// <summary>
 	/// Indicates if the followup message must use text-to-speech.
 	/// </summary>
@@ -260,7 +269,6 @@ public DiscordFollowupMessageBuilder AddFiles(Dictionary<string, Stream> files,
 				this._files.Add(new(file.Key, file.Value, null));
 		}
 
-
 		return this;
 	}
 
diff --git a/DisCatSharp/Entities/Interaction/DiscordInteraction.cs b/DisCatSharp/Entities/Interaction/DiscordInteraction.cs
index 2b4c8e04a2..b1b1dd3fc3 100644
--- a/DisCatSharp/Entities/Interaction/DiscordInteraction.cs
+++ b/DisCatSharp/Entities/Interaction/DiscordInteraction.cs
@@ -50,7 +50,15 @@ public DiscordGuild Guild
 	/// </summary>
 	[JsonIgnore] // TODO: Is now also partial "channel"
 	public DiscordChannel Channel
-		 => (this.Discord as DiscordClient).InternalGetCachedChannel(this.ChannelId) ?? (DiscordChannel)(this.Discord as DiscordClient).InternalGetCachedThread(this.ChannelId) ?? (this.Guild == null ? new DiscordDmChannel { Id = this.ChannelId, Type = ChannelType.Private, Discord = this.Discord } : new DiscordChannel() { Id = this.ChannelId, Discord = this.Discord });
+		=> (this.Discord as DiscordClient).InternalGetCachedChannel(this.ChannelId) ?? (DiscordChannel)(this.Discord as DiscordClient).InternalGetCachedThread(this.ChannelId) ?? (this.Guild == null
+			? new DiscordDmChannel
+			{
+				Id = this.ChannelId, Type = ChannelType.Private, Discord = this.Discord
+			}
+			: new DiscordChannel()
+			{
+				Id = this.ChannelId, Discord = this.Discord
+			});
 
 	/// <summary>
 	/// Gets the user that invoked this interaction.
@@ -161,14 +169,10 @@ public async Task<DiscordMessage> EditOriginalResponseAsync(DiscordWebhookBuilde
 		{
 			var attachments = this.Discord.ApiClient.GetOriginalInteractionResponseAsync(this.Discord.CurrentApplication.Id, this.Token).Result.Attachments;
 			if (attachments?.Count > 0)
-			{
 				builder.AttachmentsInternal.AddRange(attachments);
-			}
 		}
 		else if (builder.KeepAttachmentsInternal.HasValue)
-		{
 			builder.AttachmentsInternal.Clear();
-		}
 
 		return await this.Discord.ApiClient.EditOriginalInteractionResponseAsync(this.Discord.CurrentApplication.Id, this.Token, builder).ConfigureAwait(false);
 	}
@@ -212,14 +216,10 @@ public async Task<DiscordMessage> EditFollowupMessageAsync(ulong messageId, Disc
 		{
 			var attachments = this.Discord.ApiClient.GetFollowupMessageAsync(this.Discord.CurrentApplication.Id, this.Token, messageId).Result.Attachments;
 			if (attachments?.Count > 0)
-			{
 				builder.AttachmentsInternal.AddRange(attachments);
-			}
 		}
 		else if (builder.KeepAttachmentsInternal.HasValue)
-		{
 			builder.AttachmentsInternal.Clear();
-		}
 
 		return await this.Discord.ApiClient.EditFollowupMessageAsync(this.Discord.CurrentApplication.Id, this.Token, messageId, builder).ConfigureAwait(false);
 	}
@@ -232,6 +232,13 @@ public Task DeleteFollowupMessageAsync(ulong messageId)
 		=> this.Discord.ApiClient.DeleteFollowupMessageAsync(this.Discord.CurrentApplication.Id, this.Token, messageId);
 
 	internal DiscordInteraction()
-		: base(new() { "member", "guild_id", "channel_id", "channel", "guild" })
+		: base(new()
+		{
+			"member",
+			"guild_id",
+			"channel_id",
+			"channel",
+			"guild"
+		})
 	{ }
 }
diff --git a/DisCatSharp/Entities/Interaction/DiscordInteractionDataOption.cs b/DisCatSharp/Entities/Interaction/DiscordInteractionDataOption.cs
index 56fe7844df..9f80371278 100644
--- a/DisCatSharp/Entities/Interaction/DiscordInteractionDataOption.cs
+++ b/DisCatSharp/Entities/Interaction/DiscordInteractionDataOption.cs
@@ -56,7 +56,7 @@ public sealed class DiscordInteractionDataOption : ObservableApiObject
 					ApplicationCommandOptionType.Mentionable => ulong.Parse(this.RawValue),
 					ApplicationCommandOptionType.Number => double.Parse(this.RawValue),
 					ApplicationCommandOptionType.Attachment => ulong.Parse(this.RawValue),
-					_ => this.RawValue,
+					_ => this.RawValue
 				};
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Interaction/DiscordInteractionModalBuilder.cs b/DisCatSharp/Entities/Interaction/DiscordInteractionModalBuilder.cs
index c3b1522564..44686bcd51 100644
--- a/DisCatSharp/Entities/Interaction/DiscordInteractionModalBuilder.cs
+++ b/DisCatSharp/Entities/Interaction/DiscordInteractionModalBuilder.cs
@@ -19,9 +19,11 @@ public string Title
 		{
 			if (value != null && value.Length > 128)
 				throw new ArgumentException("Title length cannot exceed 128 characters.", nameof(value));
+
 			this._title = value;
 		}
 	}
+
 	private string _title;
 
 	/// <summary>
@@ -33,6 +35,7 @@ public string Title
 	/// Components to send on this interaction response.
 	/// </summary>
 	public IReadOnlyList<DiscordActionRowComponent> ModalComponents => this._components;
+
 	private readonly List<DiscordActionRowComponent> _components = new();
 
 	/// <summary>
@@ -107,7 +110,10 @@ public DiscordInteractionModalBuilder AddModalComponents(params DiscordComponent
 			throw new ArgumentException($"You try to add too many components. We already have {this._components.Count}.");
 
 		foreach (var ar in ara)
-			this._components.Add(new(new List<DiscordComponent>() { ar }));
+			this._components.Add(new(new List<DiscordComponent>()
+			{
+				ar
+			}));
 
 		return this;
 	}
@@ -138,7 +144,10 @@ public DiscordInteractionModalBuilder AddModalComponents(IEnumerable<DiscordActi
 	/// <returns>The current builder to chain calls with.</returns>
 	internal DiscordInteractionModalBuilder AddModalComponents(DiscordComponent component)
 	{
-		this._components.Add(new(new List<DiscordComponent>() { component }));
+		this._components.Add(new(new List<DiscordComponent>()
+		{
+			component
+		}));
 
 		return this;
 	}
diff --git a/DisCatSharp/Entities/Interaction/DiscordInteractionResponseBuilder.cs b/DisCatSharp/Entities/Interaction/DiscordInteractionResponseBuilder.cs
index 4fa8437daa..e2fcc30fa0 100644
--- a/DisCatSharp/Entities/Interaction/DiscordInteractionResponseBuilder.cs
+++ b/DisCatSharp/Entities/Interaction/DiscordInteractionResponseBuilder.cs
@@ -27,6 +27,7 @@ public bool IsEphemeral
 			this.FlagsChanged = true;
 		}
 	}
+
 	private bool EPH { get; set; }
 
 	/// <summary>
@@ -41,6 +42,7 @@ public bool EmbedsSuppressed
 			this.FlagsChanged = true;
 		}
 	}
+
 	private bool EMB_SUP { get; set; }
 
 	/// <summary>
@@ -55,6 +57,7 @@ public bool NotificationsSuppressed
 			this.FlagsChanged = true;
 		}
 	}
+
 	private bool NOTI_SUP { get; set; }
 
 	/// <summary>
@@ -72,28 +75,32 @@ public string Content
 		{
 			if (value != null && value.Length > 2000)
 				throw new ArgumentException("Content length cannot exceed 2000 characters.", nameof(value));
+
 			this._content = value;
 		}
 	}
+
 	private string _content;
 
 	/// <summary>
 	/// Embeds to send on this interaction response.
 	/// </summary>
 	public IReadOnlyList<DiscordEmbed> Embeds => this._embeds;
-	private readonly List<DiscordEmbed> _embeds = new();
 
+	private readonly List<DiscordEmbed> _embeds = new();
 
 	/// <summary>
 	/// Files to send on this interaction response.
 	/// </summary>
 	public IReadOnlyList<DiscordMessageFile> Files => this._files;
+
 	private readonly List<DiscordMessageFile> _files = new();
 
 	/// <summary>
 	/// Components to send on this interaction response.
 	/// </summary>
 	public IReadOnlyList<DiscordActionRowComponent> Components => this._components;
+
 	private readonly List<DiscordActionRowComponent> _components = new();
 
 	/// <summary>
@@ -101,13 +108,14 @@ public string Content
 	/// Mutually exclusive with content, embed, and components.
 	/// </summary>
 	public IReadOnlyList<DiscordApplicationCommandAutocompleteChoice> Choices => this._choices;
-	private readonly List<DiscordApplicationCommandAutocompleteChoice> _choices = new();
 
+	private readonly List<DiscordApplicationCommandAutocompleteChoice> _choices = new();
 
 	/// <summary>
 	/// Mentions to send on this interaction response.
 	/// </summary>
 	public IReadOnlyList<IMention> Mentions => this._mentions;
+
 	private readonly List<IMention> _mentions = new();
 
 	/// <summary>
@@ -115,7 +123,6 @@ public string Content
 	/// </summary>
 	public DiscordInteractionResponseBuilder() { }
 
-
 	/// <summary>
 	/// Constructs a new <see cref="DiscordInteractionResponseBuilder"/> based on an existing <see cref="DisCatSharp.Entities.DiscordMessageBuilder"/>.
 	/// </summary>
@@ -128,7 +135,6 @@ public DiscordInteractionResponseBuilder(DiscordMessageBuilder builder)
 		this._components.AddRange(builder.Components);
 	}
 
-
 	/// <summary>
 	/// Appends a collection of components to the builder. Each call will append to a new row.
 	/// </summary>
@@ -315,7 +321,6 @@ public DiscordInteractionResponseBuilder AddFiles(Dictionary<string, Stream> fil
 				this._files.Add(new(file.Key, file.Value, null));
 		}
 
-
 		return this;
 	}
 
diff --git a/DisCatSharp/Entities/Invite/DiscordInvite.cs b/DisCatSharp/Entities/Invite/DiscordInvite.cs
index 099049784a..17185ae4e9 100644
--- a/DisCatSharp/Entities/Invite/DiscordInvite.cs
+++ b/DisCatSharp/Entities/Invite/DiscordInvite.cs
@@ -155,7 +155,10 @@ public class DiscordInvite : ObservableApiObject
 	/// Initializes a new instance of the <see cref="DiscordInvite"/> class.
 	/// </summary>
 	internal DiscordInvite()
-		: base(new() { "guild_id", "channel_id" })
+		: base(new()
+		{
+			"guild_id", "channel_id"
+		})
 	{ }
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Invite/DiscordInviteStage.cs b/DisCatSharp/Entities/Invite/DiscordInviteStage.cs
index dde94c2d67..7bd8b8ed48 100644
--- a/DisCatSharp/Entities/Invite/DiscordInviteStage.cs
+++ b/DisCatSharp/Entities/Invite/DiscordInviteStage.cs
@@ -18,8 +18,7 @@ public class DiscordInviteStage : SnowflakeObject
 	[JsonIgnore]
 	public IReadOnlyDictionary<ulong, DiscordMember> Members { get; internal set; }
 
-	[JsonProperty("members", NullValueHandling = NullValueHandling.Ignore)]
-	[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
+	[JsonProperty("members", NullValueHandling = NullValueHandling.Ignore), JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 	internal ConcurrentDictionary<ulong, DiscordMember> MembersInternal = new();
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Message/DiscordMentions.cs b/DisCatSharp/Entities/Message/DiscordMentions.cs
index 8b4dcdec4a..d776dee75a 100644
--- a/DisCatSharp/Entities/Message/DiscordMentions.cs
+++ b/DisCatSharp/Entities/Message/DiscordMentions.cs
@@ -72,16 +72,13 @@ internal DiscordMentions(IEnumerable<IMention> mentions, bool mention = false, b
 		}
 
 		if (mention)
-		{
 			this.RepliedUser = repliedUser;
-		}
 
 		var roles = new HashSet<ulong>();
 		var users = new HashSet<ulong>();
 		var parse = new HashSet<string>();
 
 		foreach (var m in mentions)
-		{
 			switch (m)
 			{
 				default:
@@ -109,7 +106,6 @@ internal DiscordMentions(IEnumerable<IMention> mentions, bool mention = false, b
 					this.RepliedUser = repliedUser;
 					break;
 			}
-		}
 
 		if (!parse.Contains(PARSE_USERS) && users.Count > 0)
 			this.Users = users.ToArray();
diff --git a/DisCatSharp/Entities/Message/DiscordMessage.cs b/DisCatSharp/Entities/Message/DiscordMessage.cs
index dbdc118f09..dbadef8337 100644
--- a/DisCatSharp/Entities/Message/DiscordMessage.cs
+++ b/DisCatSharp/Entities/Message/DiscordMessage.cs
@@ -25,8 +25,8 @@ internal DiscordMessage()
 		this._attachmentsLazy = new(() => new ReadOnlyCollection<DiscordAttachment>(this.AttachmentsInternal));
 		this._embedsLazy = new(() => new ReadOnlyCollection<DiscordEmbed>(this.EmbedsInternal));
 		this._mentionedChannelsLazy = new(() => this.MentionedChannelsInternal != null
-				? new ReadOnlyCollection<DiscordChannel>(this.MentionedChannelsInternal)
-				: Array.Empty<DiscordChannel>());
+			? new ReadOnlyCollection<DiscordChannel>(this.MentionedChannelsInternal)
+			: Array.Empty<DiscordChannel>());
 		this._mentionedRolesLazy = new(() => this.MentionedRolesInternal != null ? new ReadOnlyCollection<DiscordRole>(this.MentionedRolesInternal) : Array.Empty<DiscordRole>());
 		this.MentionedUsersLazy = new(() => new ReadOnlyCollection<DiscordUser>(this.MentionedUsersInternal));
 		this._reactionsLazy = new(() => new ReadOnlyCollection<DiscordReaction>(this.ReactionsInternal));
@@ -38,10 +38,10 @@ internal DiscordMessage()
 				gid = this.Channel is DiscordDmChannel
 					? "@me"
 					: this.Channel is DiscordThreadChannel
-					? this.INTERNAL_THREAD?.GuildId?.ToString(CultureInfo.InvariantCulture)
-					: this.GuildId.HasValue
-					? this.GuildId.Value.ToString(CultureInfo.InvariantCulture)
-					: this.Channel.GuildId?.ToString(CultureInfo.InvariantCulture);
+						? this.INTERNAL_THREAD?.GuildId?.ToString(CultureInfo.InvariantCulture)
+						: this.GuildId.HasValue
+							? this.GuildId.Value.ToString(CultureInfo.InvariantCulture)
+							: this.Channel.GuildId?.ToString(CultureInfo.InvariantCulture);
 
 			var cid = this.ChannelId.ToString(CultureInfo.InvariantCulture);
 			var mid = this.Id.ToString(CultureInfo.InvariantCulture);
@@ -141,8 +141,7 @@ private DiscordThreadChannel INTERNAL_THREAD
 	[JsonProperty("author", NullValueHandling = NullValueHandling.Ignore)]
 	public DiscordUser Author { get; internal set; }
 
-	[JsonProperty("member", NullValueHandling = NullValueHandling.Ignore)]
-	[System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "<Pending>")]
+	[JsonProperty("member", NullValueHandling = NullValueHandling.Ignore), System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "<Pending>")]
 	private TransportMember TRANSPORT_MEMBER { get; set; }
 
 	/// <summary>
@@ -156,8 +155,7 @@ private DiscordThreadChannel INTERNAL_THREAD
 	/// </summary>
 	[JsonIgnore]
 	public DateTimeOffset Timestamp
-		=> !string.IsNullOrWhiteSpace(this.TimestampRaw) && DateTimeOffset.TryParse(this.TimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
-			dto : this.CreationTimestamp;
+		=> !string.IsNullOrWhiteSpace(this.TimestampRaw) && DateTimeOffset.TryParse(this.TimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ? dto : this.CreationTimestamp;
 
 	/// <summary>
 	/// Gets the message's creation timestamp as raw string.
@@ -170,8 +168,7 @@ public DateTimeOffset Timestamp
 	/// </summary>
 	[JsonIgnore]
 	public DateTimeOffset? EditedTimestamp
-		=> !string.IsNullOrWhiteSpace(this.EditedTimestampRaw) && DateTimeOffset.TryParse(this.EditedTimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
-			dto : null;
+		=> !string.IsNullOrWhiteSpace(this.EditedTimestampRaw) && DateTimeOffset.TryParse(this.EditedTimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ? dto : null;
 
 	/// <summary>
 	/// Gets the message's edit timestamp as raw string. Will be null if the message was not edited.
@@ -207,6 +204,7 @@ public IReadOnlyList<DiscordUser> MentionedUsers
 
 	[JsonProperty("mentions", NullValueHandling = NullValueHandling.Ignore)]
 	internal List<DiscordUser> MentionedUsersInternal;
+
 	[JsonIgnore]
 	internal readonly Lazy<IReadOnlyList<DiscordUser>> MentionedUsersLazy;
 
@@ -237,6 +235,7 @@ public IReadOnlyList<DiscordChannel> MentionedChannels
 
 	[JsonIgnore]
 	internal List<DiscordChannel> MentionedChannelsInternal;
+
 	[JsonIgnore]
 	private readonly Lazy<IReadOnlyList<DiscordChannel>> _mentionedChannelsLazy;
 
@@ -249,6 +248,7 @@ public IReadOnlyList<DiscordAttachment> Attachments
 
 	[JsonProperty("attachments", NullValueHandling = NullValueHandling.Ignore)]
 	internal List<DiscordAttachment> AttachmentsInternal = new();
+
 	[JsonIgnore]
 	private readonly Lazy<IReadOnlyList<DiscordAttachment>> _attachmentsLazy;
 
@@ -261,6 +261,7 @@ public IReadOnlyList<DiscordEmbed> Embeds
 
 	[JsonProperty("embeds", NullValueHandling = NullValueHandling.Ignore)]
 	internal List<DiscordEmbed> EmbedsInternal = new();
+
 	[JsonIgnore]
 	private readonly Lazy<IReadOnlyList<DiscordEmbed>> _embedsLazy;
 
@@ -273,6 +274,7 @@ public IReadOnlyList<DiscordReaction> Reactions
 
 	[JsonProperty("reactions", NullValueHandling = NullValueHandling.Ignore)]
 	internal List<DiscordReaction> ReactionsInternal = new();
+
 	[JsonIgnore]
 	private readonly Lazy<IReadOnlyList<DiscordReaction>> _reactionsLazy;
 
@@ -282,7 +284,6 @@ public IReadOnlyList<DiscordReaction> Reactions
 	[JsonProperty("nonce", NullValueHandling = NullValueHandling.Ignore)]
 	public string Nonce { get; internal set; }
 
-
 	/// <summary>
 	/// Gets whether the message is pinned.
 	/// </summary>
@@ -350,6 +351,7 @@ public bool WebhookMessage
 	/// </summary>
 	[JsonIgnore]
 	public Uri JumpLink => this._jumpLink.Value;
+
 	private readonly Lazy<Uri> _jumpLink;
 
 	/// <summary>
@@ -361,6 +363,7 @@ public IReadOnlyList<DiscordSticker> Stickers
 
 	[JsonProperty("sticker_items", NullValueHandling = NullValueHandling.Ignore)]
 	internal List<DiscordSticker> StickersInternal = new();
+
 	[JsonIgnore]
 	private readonly Lazy<IReadOnlyList<DiscordSticker>> _stickersLazy;
 
@@ -377,7 +380,6 @@ public IReadOnlyList<DiscordSticker> Stickers
 	public DiscordGuild Guild
 		=> this.GuildId.HasValue && this.Discord.Guilds.TryGetValue(this.GuildId.Value, out var guild) ? guild : null;
 
-
 	/// <summary>
 	/// Gets the message object for the referenced message
 	/// </summary>
@@ -396,7 +398,11 @@ public DiscordGuild Guild
 	/// </summary>
 	[JsonIgnore]
 	public DiscordThreadChannel Thread
-		=> this._startedThread != null! ? this._startedThread! : this.GuildId.HasValue && this.Guild.ThreadsInternal.TryGetValue(this.Id, out var thread) ? thread! : null!;
+		=> this._startedThread != null!
+			? this._startedThread!
+			: this.GuildId.HasValue && this.Guild.ThreadsInternal.TryGetValue(this.Id, out var thread)
+				? thread!
+				: null!;
 
 	[JsonProperty("thread", NullValueHandling = NullValueHandling.Ignore)]
 #pragma warning disable CS0649 // Field 'DiscordMessage._startedThread' is never assigned to, and will always have its default value null
@@ -420,8 +426,7 @@ internal DiscordMessageReference InternalBuildMessageReference()
 				? g
 				: new()
 				{
-					Id = guildId.Value,
-					Discord = client
+					Id = guildId.Value, Discord = client
 				};
 
 		var channel = client.InternalGetCachedChannel(channelId.Value);
@@ -430,8 +435,7 @@ internal DiscordMessageReference InternalBuildMessageReference()
 		{
 			reference.Channel = new()
 			{
-				Id = channelId.Value,
-				Discord = client
+				Id = channelId.Value, Discord = client
 			};
 
 			if (guildId.HasValue)
@@ -447,8 +451,7 @@ internal DiscordMessageReference InternalBuildMessageReference()
 		{
 			reference.Message = new()
 			{
-				ChannelId = this.ChannelId,
-				Discord = client
+				ChannelId = this.ChannelId, Discord = client
 			};
 
 			if (messageId.HasValue)
@@ -458,7 +461,6 @@ internal DiscordMessageReference InternalBuildMessageReference()
 		return reference;
 	}
 
-
 	/// <summary>
 	/// Gets the mentions.
 	/// </summary>
@@ -491,7 +493,6 @@ internal void PopulateMentions()
 
 		var mentionedUsers = new HashSet<DiscordUser>(new DiscordUserComparer());
 		if (guild != null)
-		{
 			foreach (var usr in this.MentionedUsersInternal)
 			{
 				usr.Discord = this.Discord;
@@ -506,9 +507,8 @@ internal void PopulateMentions()
 
 				mentionedUsers.Add(guild.MembersInternal.TryGetValue(usr.Id, out var member) ? member : usr);
 			}
-		}
+
 		if (!string.IsNullOrWhiteSpace(this.Content))
-		{
 			//mentionedUsers.UnionWith(Utilities.GetUserMentions(this).Select(this.Discord.GetCachedOrEmptyUserInternal));
 			if (guild != null)
 			{
@@ -516,12 +516,10 @@ internal void PopulateMentions()
 				this.MentionedRolesInternal = this.MentionedRolesInternal.Union(this.MentionedRoleIds.Select(xid => guild.GetRole(xid))).ToList();
 				this.MentionedChannelsInternal = this.MentionedChannelsInternal.Union(Utilities.GetChannelMentions(this).Select(xid => guild.GetChannel(xid))).ToList();
 			}
-		}
 
 		this.MentionedUsersInternal = mentionedUsers.ToList();
 	}
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Edits the message.
@@ -535,7 +533,6 @@ public Task<DiscordMessage> ModifyAsync(Optional<string> content)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, content, default, this.GetMentions(), default, default, Array.Empty<DiscordMessageFile>(), default);
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Edits the message.
@@ -547,8 +544,10 @@ public Task<DiscordMessage> ModifyAsync(Optional<string> content)
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public Task<DiscordMessage> ModifyAsync(Optional<DiscordEmbed> embed = default)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
-		=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, default, embed.Map(v => new[] { v }).ValueOr(Array.Empty<DiscordEmbed>()), this.GetMentions(), default, default, Array.Empty<DiscordMessageFile>(), default);
-
+		=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, default, embed.Map(v => new[]
+		{
+			v
+		}).ValueOr(Array.Empty<DiscordEmbed>()), this.GetMentions(), default, default, Array.Empty<DiscordMessageFile>(), default);
 
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
@@ -562,8 +561,10 @@ public Task<DiscordMessage> ModifyAsync(Optional<DiscordEmbed> embed = default)
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public Task<DiscordMessage> ModifyAsync(Optional<string> content, Optional<DiscordEmbed> embed = default)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
-		=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, content, embed.Map(v => new[] { v }).ValueOr(Array.Empty<DiscordEmbed>()), this.GetMentions(), default, default, Array.Empty<DiscordMessageFile>(), default);
-
+		=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, content, embed.Map(v => new[]
+		{
+			v
+		}).ValueOr(Array.Empty<DiscordEmbed>()), this.GetMentions(), default, default, Array.Empty<DiscordMessageFile>(), default);
 
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
@@ -579,7 +580,6 @@ public Task<DiscordMessage> ModifyAsync(Optional<string> content, Optional<IEnum
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, content, embeds, this.GetMentions(), default, default, Array.Empty<DiscordMessageFile>(), default);
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Edits the message.
@@ -593,10 +593,13 @@ public async Task<DiscordMessage> ModifyAsync(DiscordMessageBuilder builder)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 	{
 		builder.Validate(true);
-		return await this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, builder.Content, Optional.Some(builder.Embeds.AsEnumerable()), builder.Mentions, builder.Components, builder.Suppressed, builder.Files, builder.Attachments.Count > 0 ? Optional.Some(builder.Attachments.AsEnumerable()) : builder.KeepAttachmentsInternal.HasValue ? builder.KeepAttachmentsInternal.Value && this.Attachments is not null ? Optional.Some(this.Attachments.AsEnumerable()) : Array.Empty<DiscordAttachment>() : Optional.None).ConfigureAwait(false);
+		return await this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, builder.Content, Optional.Some(builder.Embeds.AsEnumerable()), builder.Mentions, builder.Components, builder.Suppressed, builder.Files, builder.Attachments.Count > 0
+			? Optional.Some(builder.Attachments.AsEnumerable())
+			: builder.KeepAttachmentsInternal.HasValue
+				? builder.KeepAttachmentsInternal.Value && this.Attachments is not null ? Optional.Some(this.Attachments.AsEnumerable()) : Array.Empty<DiscordAttachment>()
+				: Optional.None).ConfigureAwait(false);
 	}
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Edits the message embed suppression.
@@ -617,7 +620,6 @@ public Task<DiscordMessage> ModifySuppressionAsync(bool suppress = false)
 	public Task<DiscordMessage> ClearAttachmentsAsync()
 		=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, default, default, this.GetMentions(), default, default, default, Array.Empty<DiscordAttachment>());
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Edits the message.
@@ -633,10 +635,13 @@ public async Task<DiscordMessage> ModifyAsync(Action<DiscordMessageBuilder> acti
 		var builder = new DiscordMessageBuilder();
 		action(builder);
 		builder.Validate(true);
-		return await this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, builder.Content, Optional.Some(builder.Embeds.AsEnumerable()), builder.Mentions, builder.Components, builder.Suppressed, builder.Files, builder.Attachments.Count > 0 ? Optional.Some(builder.Attachments.AsEnumerable()) : builder.KeepAttachmentsInternal.HasValue ? builder.KeepAttachmentsInternal.Value && this.Attachments is not null ? Optional.Some(this.Attachments.AsEnumerable()) : Array.Empty<DiscordAttachment>() : Optional.None).ConfigureAwait(false);
+		return await this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, builder.Content, Optional.Some(builder.Embeds.AsEnumerable()), builder.Mentions, builder.Components, builder.Suppressed, builder.Files, builder.Attachments.Count > 0
+			? Optional.Some(builder.Attachments.AsEnumerable())
+			: builder.KeepAttachmentsInternal.HasValue
+				? builder.KeepAttachmentsInternal.Value && this.Attachments is not null ? Optional.Some(this.Attachments.AsEnumerable()) : Array.Empty<DiscordAttachment>()
+				: Optional.None).ConfigureAwait(false);
 	}
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Deletes the message.
@@ -649,7 +654,6 @@ public Task DeleteAsync(string reason = null)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Discord.ApiClient.DeleteMessageAsync(this.ChannelId, this.Id, reason);
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Creates a thread.
@@ -670,7 +674,6 @@ public async Task<DiscordThreadChannel> CreateThreadAsync(string name, ThreadAut
 			: throw new NotSupportedException($"Cannot modify ThreadAutoArchiveDuration. Guild needs boost tier {(autoArchiveDuration == ThreadAutoArchiveDuration.ThreeDays ? "one" : "two")}.");
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Pins the message in its channel.
@@ -683,7 +686,6 @@ public Task PinAsync()
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Discord.ApiClient.PinMessageAsync(this.ChannelId, this.Id);
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Unpins the message in its channel.
@@ -696,7 +698,6 @@ public Task UnpinAsync()
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Discord.ApiClient.UnpinMessageAsync(this.ChannelId, this.Id);
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Responds to the message. This produces a reply.
@@ -709,8 +710,7 @@ public Task UnpinAsync()
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public Task<DiscordMessage> RespondAsync(string content)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
-		=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, content, null, sticker: null, replyMessageId: this.Id, mentionReply: false, failOnInvalidReply: false);
-
+		=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, content, null, null, this.Id, false, false);
 
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
@@ -724,8 +724,12 @@ public Task<DiscordMessage> RespondAsync(string content)
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public Task<DiscordMessage> RespondAsync(DiscordEmbed embed)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
-		=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, null, embed != null ? new[] { embed } : null, sticker: null, replyMessageId: this.Id, mentionReply: false, failOnInvalidReply: false);
-
+		=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, null, embed != null
+			? new[]
+			{
+				embed
+			}
+			: null, null, this.Id, false, false);
 
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
@@ -740,8 +744,12 @@ public Task<DiscordMessage> RespondAsync(DiscordEmbed embed)
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public Task<DiscordMessage> RespondAsync(string content, DiscordEmbed embed)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
-		=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, content, embed != null ? new[] { embed } : null, sticker: null, replyMessageId: this.Id, mentionReply: false, failOnInvalidReply: false);
-
+		=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, content, embed != null
+			? new[]
+			{
+				embed
+			}
+			: null, null, this.Id, false, false);
 
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
@@ -755,8 +763,7 @@ public Task<DiscordMessage> RespondAsync(string content, DiscordEmbed embed)
 	/// <exception cref="ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 	public Task<DiscordMessage> RespondAsync(DiscordMessageBuilder builder)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
-		=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, builder.WithReply(this.Id, mention: false, failOnInvalidReply: false));
-
+		=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, builder.WithReply(this.Id, false, false));
 
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
@@ -773,10 +780,9 @@ public Task<DiscordMessage> RespondAsync(Action<DiscordMessageBuilder> action)
 	{
 		var builder = new DiscordMessageBuilder();
 		action(builder);
-		return this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, builder.WithReply(this.Id, mention: false, failOnInvalidReply: false));
+		return this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, builder.WithReply(this.Id, false, false));
 	}
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Creates a reaction to this message.
@@ -790,7 +796,6 @@ public Task CreateReactionAsync(DiscordEmoji emoji)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Discord.ApiClient.CreateReactionAsync(this.ChannelId, this.Id, emoji.ToReactionString());
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Deletes your own reaction
@@ -803,7 +808,6 @@ public Task DeleteOwnReactionAsync(DiscordEmoji emoji)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Discord.ApiClient.DeleteOwnReactionAsync(this.ChannelId, this.Id, emoji.ToReactionString());
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Deletes another user's reaction.
@@ -819,7 +823,6 @@ public Task DeleteReactionAsync(DiscordEmoji emoji, DiscordUser user, string rea
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Discord.ApiClient.DeleteUserReactionAsync(this.ChannelId, this.Id, user.Id, emoji.ToReactionString(), reason);
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Gets users that reacted with this emoji.
@@ -834,7 +837,6 @@ public Task<IReadOnlyList<DiscordUser>> GetReactionsAsync(DiscordEmoji emoji, in
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.GetReactionsInternalAsync(emoji, limit, after);
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Deletes all reactions for this message.
@@ -848,7 +850,6 @@ public Task DeleteAllReactionsAsync(string reason = null)
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 		=> this.Discord.ApiClient.DeleteAllReactionsAsync(this.ChannelId, this.Id, reason);
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Deletes all reactions of a specific reaction for this message.
@@ -917,7 +918,7 @@ public override bool Equals(object obj)
 	/// <param name="e"><see cref="DiscordMessage"/> to compare to.</param>
 	/// <returns>Whether the <see cref="DiscordMessage"/> is equal to this <see cref="DiscordMessage"/>.</returns>
 	public bool Equals(DiscordMessage e)
-		=> e is not null && (ReferenceEquals(this, e) || (this.Id == e.Id && this.ChannelId == e.ChannelId));
+		=> e is not null && (ReferenceEquals(this, e) || this.Id == e.Id && this.ChannelId == e.ChannelId);
 
 	/// <summary>
 	/// Gets the hash code for this <see cref="DiscordMessage"/>.
@@ -927,8 +928,8 @@ public override int GetHashCode()
 	{
 		var hash = 13;
 
-		hash = (hash * 7) + this.Id.GetHashCode();
-		hash = (hash * 7) + this.ChannelId.GetHashCode();
+		hash = hash * 7 + this.Id.GetHashCode();
+		hash = hash * 7 + this.ChannelId.GetHashCode();
 
 		return hash;
 	}
@@ -945,8 +946,8 @@ public override int GetHashCode()
 		var o2 = e2 as object;
 
 		return (o1 != null || o2 == null)
-			&& (o1 == null || o2 != null)
-			&& ((o1 == null && o2 == null) || (e1.Id == e2.Id && e1.ChannelId == e2.ChannelId));
+		       && (o1 == null || o2 != null)
+		       && (o1 == null && o2 == null || e1.Id == e2.Id && e1.ChannelId == e2.ChannelId);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs b/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs
index 7486a5bc50..bf7622700f 100644
--- a/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs
+++ b/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs
@@ -21,9 +21,11 @@ public string Content
 		{
 			if (value != null && value.Length > 2000)
 				throw new ArgumentException("Content cannot exceed 2000 characters.", nameof(value));
+
 			this._content = value;
 		}
 	}
+
 	private string _content;
 
 	/// <summary>
@@ -48,6 +50,7 @@ public DiscordEmbed Embed
 	/// Gets the Embeds to be sent.
 	/// </summary>
 	public IReadOnlyList<DiscordEmbed> Embeds => this._embeds;
+
 	private readonly List<DiscordEmbed> _embeds = new();
 
 	/// <summary>
@@ -69,18 +72,21 @@ public DiscordEmbed Embed
 	/// Gets the Files to be sent in the Message.
 	/// </summary>
 	public IReadOnlyCollection<DiscordMessageFile> Files => this.FilesInternal;
+
 	internal readonly List<DiscordMessageFile> FilesInternal = new();
 
 	/// <summary>
 	/// Gets the components that will be attached to the message.
 	/// </summary>
 	public IReadOnlyList<DiscordActionRowComponent> Components => this.ComponentsInternal;
+
 	internal readonly List<DiscordActionRowComponent> ComponentsInternal = new(5);
 
 	/// <summary>
 	/// Gets the Attachments to be sent in the Message.
 	/// </summary>
 	public IReadOnlyList<DiscordAttachment> Attachments => this.AttachmentsInternal;
+
 	internal readonly List<DiscordAttachment> AttachmentsInternal = new();
 
 	/// <summary>
@@ -136,7 +142,6 @@ public DiscordMessageBuilder WithSticker(DiscordSticker sticker)
 	public DiscordMessageBuilder AddComponents(params DiscordComponent[] components)
 		=> this.AddComponents((IEnumerable<DiscordComponent>)components);
 
-
 	/// <summary>
 	/// Appends several rows of components to the message
 	/// </summary>
@@ -212,6 +217,7 @@ public DiscordMessageBuilder AddEmbed(DiscordEmbed embed)
 	{
 		if (embed == null)
 			return this; //Providing null embeds will produce a 400 response from Discord.//
+
 		this._embeds.Add(embed);
 		return this;
 	}
@@ -237,7 +243,10 @@ public DiscordMessageBuilder WithAllowedMention(IMention allowedMention)
 		if (this.Mentions != null)
 			this.Mentions.Add(allowedMention);
 		else
-			this.Mentions = new() { allowedMention };
+			this.Mentions = new()
+			{
+				allowedMention
+			};
 
 		return this;
 	}
@@ -333,9 +342,7 @@ public DiscordMessageBuilder AddGcpAttachment(GcpAttachmentUploadInformation gcp
 	{
 		this.AttachmentsInternal.Add(new()
 		{
-			Filename = gcpAttachment.Filename,
-			UploadedFilename = gcpAttachment.UploadFilename,
-			Description = gcpAttachment.Description
+			Filename = gcpAttachment.Filename, UploadedFilename = gcpAttachment.UploadFilename, Description = gcpAttachment.Description
 		});
 
 		return this;
@@ -384,7 +391,6 @@ public DiscordMessageBuilder WithReply(ulong messageId, bool mention = false, bo
 		return this;
 	}
 
-
 	/// <summary>
 	/// Sends the Message to a specific channel
 	/// </summary>
diff --git a/DisCatSharp/Entities/Message/GcpAttachment.cs b/DisCatSharp/Entities/Message/GcpAttachment.cs
index fcaa54eb6f..2599788c46 100644
--- a/DisCatSharp/Entities/Message/GcpAttachment.cs
+++ b/DisCatSharp/Entities/Message/GcpAttachment.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/DisCatSharp/Entities/Message/Mentions.cs b/DisCatSharp/Entities/Message/Mentions.cs
index 61406b354f..9952aa5811 100644
--- a/DisCatSharp/Entities/Message/Mentions.cs
+++ b/DisCatSharp/Entities/Message/Mentions.cs
@@ -6,8 +6,8 @@ namespace DisCatSharp.Entities;
 /// <summary>
 /// Interface for mentionables
 /// </summary>
-public interface IMention { }
-
+public interface IMention
+{ }
 
 /// <summary>
 /// Allows a reply to ping the user being replied to.
@@ -101,7 +101,10 @@ public static class Mentions
 	/// <summary>
 	/// All possible mentions - @everyone + @here, users, and roles.
 	/// </summary>
-	public static IReadOnlyList<IMention> All { get; } = new IMention[] { EveryoneMention.All, UserMention.All, RoleMention.All };
+	public static IReadOnlyList<IMention> All { get; } = new IMention[]
+	{
+		EveryoneMention.All, UserMention.All, RoleMention.All
+	};
 
 	/// <summary>
 	/// No mentions allowed.
diff --git a/DisCatSharp/Entities/Optional.cs b/DisCatSharp/Entities/Optional.cs
index 24888cb658..8748fd0b85 100644
--- a/DisCatSharp/Entities/Optional.cs
+++ b/DisCatSharp/Entities/Optional.cs
@@ -222,7 +222,7 @@ public override bool Equals(object obj) =>
 		{
 			T t => this.Equals(t),
 			Optional<T> opt => this.Equals(opt),
-			_ => false,
+			_ => false
 		};
 
 	/// <summary>
@@ -230,7 +230,7 @@ public override bool Equals(object obj) =>
 	/// </summary>
 	/// <param name="e"><see cref="Optional{T}"/> to compare to.</param>
 	/// <returns>Whether the <see cref="Optional{T}"/> is equal to this <see cref="Optional{T}"/>.</returns>
-	public bool Equals(Optional<T> e) => (!this.HasValue && !e.HasValue) || (this.HasValue == e.HasValue && this.Value.Equals(e.Value));
+	public bool Equals(Optional<T> e) => !this.HasValue && !e.HasValue || this.HasValue == e.HasValue && this.Value.Equals(e.Value);
 
 	/// <summary>
 	/// Checks whether the value of this <see cref="Optional{T}"/> is equal to specified object.
@@ -339,17 +339,13 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		var val = (value as IOptional).RawValue;
 		// JToken.FromObject will throw if `null` so we manually write a null value.
 		if (val == null)
-		{
 			// you can read serializer.NullValueHandling here, but unfortunately you can **not** skip serialization
 			// here, or else you will get a nasty JsonWriterException, so we just ignore its value and manually
 			// write the null.
 			writer.WriteToken(JsonToken.Null);
-		}
 		else
-		{
 			// convert the value to a JSON object and write it to the property value.
 			JToken.FromObject(val).WriteTo(writer);
-		}
 	}
 
 	/// <summary>
@@ -359,15 +355,22 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 	/// <param name="objectType">The object type.</param>
 	/// <param name="existingValue">The existing value.</param>
 	/// <param name="serializer">The serializer.</param>
-	public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
-		JsonSerializer serializer)
+	public override object ReadJson(
+		JsonReader reader,
+		Type objectType,
+		object existingValue,
+		JsonSerializer serializer
+	)
 	{
 		var genericType = objectType.GenericTypeArguments[0];
 
 		var constructor = objectType.GetTypeInfo().DeclaredConstructors
 			.FirstOrDefault(e => e.GetParameters()[0].ParameterType == genericType);
 
-		return constructor.Invoke(new[] { serializer.Deserialize(reader, genericType) });
+		return constructor.Invoke(new[]
+		{
+			serializer.Deserialize(reader, genericType)
+		});
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Sticker/DiscordSticker.cs b/DisCatSharp/Entities/Sticker/DiscordSticker.cs
index 9425a83361..5cfd420c1a 100644
--- a/DisCatSharp/Entities/Sticker/DiscordSticker.cs
+++ b/DisCatSharp/Entities/Sticker/DiscordSticker.cs
@@ -138,7 +138,6 @@ public bool Equals(DiscordSticker other)
 	/// </summary>
 	public override string ToString() => $"Sticker {this.Id}; {this.Name}; {this.FormatType}";
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Modifies the sticker
@@ -164,7 +163,6 @@ public Task<DiscordSticker> ModifyAsync(Optional<string> name, Optional<string>
 						: this.Discord.ApiClient.ModifyGuildStickerAsync(this.GuildId.Value, this.Id, name, description, tags, reason);
 #pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 
-
 #pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
 	/// <summary>
 	/// Deletes the sticker
diff --git a/DisCatSharp/Entities/Store/DiscordStoreSku.cs b/DisCatSharp/Entities/Store/DiscordStoreSku.cs
index 09aabe3884..e729128105 100644
--- a/DisCatSharp/Entities/Store/DiscordStoreSku.cs
+++ b/DisCatSharp/Entities/Store/DiscordStoreSku.cs
@@ -41,7 +41,7 @@ public override bool Equals(object obj)
 	/// <param name="e"><see cref="DiscordStoreSku"/> to compare to.</param>
 	/// <returns>Whether the <see cref="DiscordStoreSku"/> is equal to this <see cref="DiscordStoreSku"/>.</returns>
 	public bool Equals(DiscordStoreSku e)
-		=> e is not null && (ReferenceEquals(this, e) || (this.Id == e.Id));
+		=> e is not null && (ReferenceEquals(this, e) || this.Id == e.Id);
 
 	/// <summary>
 	/// Gets the hash code for this <see cref="DiscordStoreSku"/>.
@@ -62,8 +62,8 @@ public override int GetHashCode()
 		var o2 = e2 as object;
 
 		return (o1 != null || o2 == null)
-			&& (o1 == null || o2 != null)
-			&& ((o1 == null && o2 == null) || (e1.Id == e2.Id));
+		       && (o1 == null || o2 != null)
+		       && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/User/DiscordActivity.cs b/DisCatSharp/Entities/User/DiscordActivity.cs
index 49642665ed..9d2b155a1e 100644
--- a/DisCatSharp/Entities/User/DiscordActivity.cs
+++ b/DisCatSharp/Entities/User/DiscordActivity.cs
@@ -59,7 +59,6 @@ internal sealed class UserStatusConverter : JsonConverter
 	public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 	{
 		if (value is UserStatus status)
-		{
 			switch (status) // reader.Value can be a string, DateTime or DateTimeOffset (yes, it's weird)
 			{
 				case UserStatus.Online:
@@ -87,7 +86,6 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 					writer.WriteValue("offline");
 					return;
 			}
-		}
 	}
 
 	/// <summary>
@@ -107,7 +105,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			"dnd" => UserStatus.DoNotDisturb,
 			"invisible" => UserStatus.Invisible,
 			"streaming" => UserStatus.Streaming,
-			_ => UserStatus.Offline,
+			_ => UserStatus.Offline
 		};
 
 	/// <summary>
@@ -258,14 +256,13 @@ internal void UpdateWith(TransportActivity rawActivity)
 
 		if (rawActivity?.IsCustomStatus() == true && this.CustomStatus != null)
 			this.CustomStatus.UpdateWith(rawActivity.State, rawActivity.Emoji);
-		else this.CustomStatus = rawActivity?.IsCustomStatus() == true
-			? new DiscordCustomStatus
-			{
-				Name = rawActivity.Name!,
-				State = rawActivity.State,
-				Emoji = rawActivity.Emoji
-			}
-			: null;
+		else
+			this.CustomStatus = rawActivity?.IsCustomStatus() == true
+				? new DiscordCustomStatus
+				{
+					Name = rawActivity.Name!, State = rawActivity.State, Emoji = rawActivity.Emoji
+				}
+				: null;
 	}
 }
 
@@ -456,7 +453,12 @@ internal void UpdateWith(TransportActivity rawGame)
 	{
 		this.Details = rawGame?.Details;
 		this.State = rawGame?.State;
-		this.Application = rawGame?.ApplicationId != null ? new DiscordApplication { Id = rawGame.ApplicationId.Value } : null;
+		this.Application = rawGame?.ApplicationId != null
+			? new DiscordApplication
+			{
+				Id = rawGame.ApplicationId.Value
+			}
+			: null;
 		this.Instance = rawGame?.Instance;
 		this.LargeImageText = rawGame?.Assets?.LargeImageText;
 		this.SmallImageText = rawGame?.Assets?.SmallImageText;
@@ -475,18 +477,30 @@ internal void UpdateWith(TransportActivity rawGame)
 		if (lid != null)
 		{
 			if (lid.StartsWith("spotify:"))
-				this.LargeImage = new DiscordSpotifyAsset { Id = lid };
+				this.LargeImage = new DiscordSpotifyAsset
+				{
+					Id = lid
+				};
 			else if (ulong.TryParse(lid, NumberStyles.Number, CultureInfo.InvariantCulture, out var ulid))
-				this.LargeImage = new DiscordApplicationAsset { Id = lid, Application = this.Application, Type = ApplicationAssetType.LargeImage };
+				this.LargeImage = new DiscordApplicationAsset
+				{
+					Id = lid, Application = this.Application, Type = ApplicationAssetType.LargeImage
+				};
 		}
 
 		var sid = rawGame?.Assets?.SmallImage;
 		if (sid != null)
 		{
 			if (sid.StartsWith("spotify:"))
-				this.SmallImage = new DiscordSpotifyAsset { Id = sid };
+				this.SmallImage = new DiscordSpotifyAsset
+				{
+					Id = sid
+				};
 			else if (ulong.TryParse(sid, NumberStyles.Number, CultureInfo.InvariantCulture, out var usid))
-				this.SmallImage = new DiscordApplicationAsset { Id = sid, Application = this.Application, Type = ApplicationAssetType.LargeImage };
+				this.SmallImage = new DiscordApplicationAsset
+				{
+					Id = sid, Application = this.Application, Type = ApplicationAssetType.LargeImage
+				};
 		}
 	}
 }
diff --git a/DisCatSharp/Entities/User/DiscordPresence.cs b/DisCatSharp/Entities/User/DiscordPresence.cs
index d242042c50..fa4b8566b5 100644
--- a/DisCatSharp/Entities/User/DiscordPresence.cs
+++ b/DisCatSharp/Entities/User/DiscordPresence.cs
@@ -87,7 +87,10 @@ public DiscordGuild Guild
 	/// </summary>
 	// TODO: Add broadcast field
 	internal DiscordPresence()
-		: base(new() { "broadcast" })
+		: base(new()
+		{
+			"broadcast"
+		})
 	{ }
 
 	/// <summary>
@@ -95,7 +98,10 @@ internal DiscordPresence()
 	/// </summary>
 	/// <param name="other">The other.</param>
 	internal DiscordPresence(DiscordPresence other)
-		: base(new() { "broadcast" })
+		: base(new()
+		{
+			"broadcast"
+		})
 	{
 		this.Discord = other.Discord;
 		this.Activity = other.Activity;
diff --git a/DisCatSharp/Entities/User/DiscordUser.cs b/DisCatSharp/Entities/User/DiscordUser.cs
index df61dbbbbd..e2bfd961cf 100644
--- a/DisCatSharp/Entities/User/DiscordUser.cs
+++ b/DisCatSharp/Entities/User/DiscordUser.cs
@@ -23,7 +23,10 @@ public class DiscordUser : SnowflakeObject, IEquatable<DiscordUser>
 	/// Initializes a new instance of the <see cref="DiscordUser"/> class.
 	/// </summary>
 	internal DiscordUser()
-		: base(new() { "display_name", "linked_users", "banner_color" })
+		: base(new()
+		{
+			"display_name", "linked_users", "banner_color"
+		})
 	{ }
 
 	/// <summary>
@@ -65,7 +68,11 @@ internal DiscordUser(TransportUser transport)
 	/// </summary>
 	[JsonIgnore, DiscordDeprecated("We will internally use the GlobalName if a user is already migrated. This will be removed in future. Consider switching to UsernameWithGlobalName then.")]
 	public virtual string UsernameWithDiscriminator
-		=> this.IsMigrated ? this.UsernameWithGlobalName : $"{this.Username}#{this.Discriminator}";
+		=> this.IsMigrated
+			? this.UsernameWithGlobalName
+			: !string.IsNullOrEmpty(this.Username) && !string.IsNullOrEmpty(this.Discriminator)
+				? $"{this.Username}#{this.Discriminator}"
+				: string.Empty;
 
 	/// <summary>
 	/// Gets the username with the global name.
@@ -271,7 +278,7 @@ public string Mention
 	public bool IsCurrent
 		=> this.Id == this.Discord.CurrentUser.Id;
 
-	#region Extension of DiscordUser
+#region Extension of DiscordUser
 
 	/// <summary>
 	/// Whether this member is a <see cref="UserFlags.CertifiedModerator"/>
@@ -279,7 +286,7 @@ public bool IsCurrent
 	/// <returns><see cref="bool"/></returns>
 	[JsonIgnore]
 	public bool IsMod
-			=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.CertifiedModerator);
+		=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.CertifiedModerator);
 
 	/// <summary>
 	/// Whether this member is a <see cref="UserFlags.Partner"/>
@@ -287,7 +294,7 @@ public bool IsMod
 	/// <returns><see cref="bool"/></returns>
 	[JsonIgnore]
 	public bool IsPartner
-			=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.Partner);
+		=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.Partner);
 
 	/// <summary>
 	/// Whether this member is a <see cref="UserFlags.VerifiedBot"/>
@@ -295,7 +302,7 @@ public bool IsPartner
 	/// <returns><see cref="bool"/></returns>
 	[JsonIgnore]
 	public bool IsVerifiedBot
-			=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.VerifiedBot);
+		=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.VerifiedBot);
 
 	/// <summary>
 	/// Whether this member is a <see cref="UserFlags.VerifiedDeveloper"/>
@@ -303,7 +310,7 @@ public bool IsVerifiedBot
 	/// <returns><see cref="bool"/></returns>
 	[JsonIgnore]
 	public bool IsBotDev
-			=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.VerifiedDeveloper);
+		=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.VerifiedDeveloper);
 
 	/// <summary>
 	/// Whether this member is a <see cref="UserFlags.ActiveDeveloper"/>
@@ -311,7 +318,7 @@ public bool IsBotDev
 	/// <returns><see cref="bool"/></returns>
 	[JsonIgnore]
 	public bool IsActiveDeveloper
-			=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.ActiveDeveloper);
+		=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.ActiveDeveloper);
 
 	/// <summary>
 	/// Whether this member is a <see cref="UserFlags.Staff"/>
@@ -319,9 +326,9 @@ public bool IsActiveDeveloper
 	/// <returns><see cref="bool"/></returns>
 	[JsonIgnore]
 	public bool IsStaff
-			=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.Staff);
+		=> this.Flags.HasValue && this.Flags.Value.HasFlag(UserFlags.Staff);
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Fetches the user from the API.
@@ -358,7 +365,6 @@ public async Task<bool> IsInGuild(DiscordGuild guild)
 		{
 			var member = await guild.GetMemberAsync(this.Id).ConfigureAwait(false);
 			return member is not null;
-
 		}
 		catch (NotFoundException)
 		{
@@ -430,7 +436,7 @@ public string GetAvatarUrl(ImageFormat fmt, ushort size = 1024)
 			ImageFormat.Png => "png",
 			ImageFormat.WebP => "webp",
 			ImageFormat.Auto => !string.IsNullOrWhiteSpace(this.AvatarHash) ? this.AvatarHash.StartsWith("a_") ? "gif" : "png" : "png",
-			_ => throw new ArgumentOutOfRangeException(nameof(fmt)),
+			_ => throw new ArgumentOutOfRangeException(nameof(fmt))
 		};
 		var ssize = size.ToString(CultureInfo.InvariantCulture);
 		if (!string.IsNullOrWhiteSpace(this.AvatarHash))
@@ -567,7 +573,7 @@ public override string ToString()
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Voice/DiscordVoiceRegion.cs b/DisCatSharp/Entities/Voice/DiscordVoiceRegion.cs
index cf659885f5..f005338e5a 100644
--- a/DisCatSharp/Entities/Voice/DiscordVoiceRegion.cs
+++ b/DisCatSharp/Entities/Voice/DiscordVoiceRegion.cs
@@ -78,7 +78,7 @@ public bool Equals(DiscordVoiceRegion region)
 		var o1 = left as object;
 		var o2 = right as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || left.Id == right.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || left.Id == right.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Voice/DiscordVoiceState.cs b/DisCatSharp/Entities/Voice/DiscordVoiceState.cs
index bc1872d640..513232978f 100644
--- a/DisCatSharp/Entities/Voice/DiscordVoiceState.cs
+++ b/DisCatSharp/Entities/Voice/DiscordVoiceState.cs
@@ -129,7 +129,12 @@ public DiscordUser User
 	/// </summary>
 	[JsonIgnore]
 	public DiscordMember Member
-		=> this.Guild.Members.TryGetValue(this.TransportMember.User.Id, out var member) ? member : new(this.TransportMember) { Discord = this.Discord };
+		=> this.Guild.Members.TryGetValue(this.TransportMember.User.Id, out var member)
+			? member
+			: new(this.TransportMember)
+			{
+				Discord = this.Discord
+			};
 
 	/// <summary>
 	/// Gets the transport member.
diff --git a/DisCatSharp/Entities/Webhook/DiscordWebhook.cs b/DisCatSharp/Entities/Webhook/DiscordWebhook.cs
index a1def3c8dd..9018864e68 100644
--- a/DisCatSharp/Entities/Webhook/DiscordWebhook.cs
+++ b/DisCatSharp/Entities/Webhook/DiscordWebhook.cs
@@ -86,11 +86,16 @@ public string AvatarUrl
 	[JsonProperty("token", NullValueHandling = NullValueHandling.Ignore)]
 	public string Token { get; internal set; }
 
+	/// <summary>
+	/// Gets the type of this webhook.
+	/// </summary>
+	[JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
+	public WebhookType Type { get; internal set; }
+
 	/// <summary>
 	/// Initializes a new instance of the <see cref="DiscordWebhook"/> class.
 	/// </summary>
 	internal DiscordWebhook()
-		: base(new() { "type" })
 	{ }
 
 	/// <summary>
@@ -223,13 +228,9 @@ public async Task<DiscordMessage> EditMessageAsync(ulong messageId, DiscordWebho
 	{
 		builder.Validate(true);
 		if (builder.KeepAttachmentsInternal.HasValue && builder.KeepAttachmentsInternal.Value)
-		{
 			builder.AttachmentsInternal.AddRange(this.ApiClient.GetWebhookMessageAsync(this.Id, this.Token, messageId.ToString(), threadId).Result.Attachments);
-		}
 		else if (builder.KeepAttachmentsInternal.HasValue)
-		{
 			builder.AttachmentsInternal.Clear();
-		}
 		return await (this.Discord?.ApiClient ?? this.ApiClient).EditWebhookMessageAsync(this.Id, this.Token, messageId.ToString(), builder, threadId).ConfigureAwait(false);
 	}
 
@@ -285,7 +286,7 @@ public Task DeleteMessageAsync(ulong messageId, ulong threadId)
 		var o1 = e1 as object;
 		var o2 = e2 as object;
 
-		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
+		return (o1 != null || o2 == null) && (o1 == null || o2 != null) && (o1 == null && o2 == null || e1.Id == e2.Id);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Entities/Webhook/DiscordWebhookBuilder.cs b/DisCatSharp/Entities/Webhook/DiscordWebhookBuilder.cs
index 40ca2ac1e4..b53437832c 100644
--- a/DisCatSharp/Entities/Webhook/DiscordWebhookBuilder.cs
+++ b/DisCatSharp/Entities/Webhook/DiscordWebhookBuilder.cs
@@ -53,9 +53,11 @@ public string Content
 		{
 			if (value != null && value.Length > 2000)
 				throw new ArgumentException("Content length cannot exceed 2000 characters.", nameof(value));
+
 			this._content = value;
 		}
 	}
+
 	private string _content;
 
 	/// <summary>
@@ -64,7 +66,6 @@ public string Content
 	/// </summary>
 	public string ThreadName { get; set; }
 
-
 	/// <summary>
 	/// Whether to keep previous attachments.
 	/// </summary>
@@ -74,31 +75,35 @@ public string Content
 	/// Embeds to send on this webhook request.
 	/// </summary>
 	public IReadOnlyList<DiscordEmbed> Embeds => this._embeds;
+
 	private readonly List<DiscordEmbed> _embeds = new();
 
 	/// <summary>
 	/// Files to send on this webhook request.
 	/// </summary>
 	public IReadOnlyList<DiscordMessageFile> Files => this._files;
+
 	private readonly List<DiscordMessageFile> _files = new();
 
 	/// <summary>
 	/// Mentions to send on this webhook request.
 	/// </summary>
 	public IReadOnlyList<IMention> Mentions => this._mentions;
+
 	private readonly List<IMention> _mentions = new();
 
 	/// <summary>
 	/// Gets the components.
 	/// </summary>
 	public IReadOnlyList<DiscordActionRowComponent> Components => this._components;
-	private readonly List<DiscordActionRowComponent> _components = new();
 
+	private readonly List<DiscordActionRowComponent> _components = new();
 
 	/// <summary>
 	/// Attachments to keep on this webhook request.
 	/// </summary>
 	public IReadOnlyList<DiscordAttachment> Attachments => this.AttachmentsInternal;
+
 	internal List<DiscordAttachment> AttachmentsInternal = new();
 
 	/// <summary>
@@ -316,7 +321,6 @@ public DiscordWebhookBuilder AddFiles(Dictionary<string, Stream> files, bool res
 				this._files.Add(new(file.Key, file.Value, null));
 		}
 
-
 		return this;
 	}
 
diff --git a/DisCatSharp/Enums/Application/ApplicationCommandContexts.cs b/DisCatSharp/Enums/Application/ApplicationCommandContexts.cs
index a989953163..7ab12b70bb 100644
--- a/DisCatSharp/Enums/Application/ApplicationCommandContexts.cs
+++ b/DisCatSharp/Enums/Application/ApplicationCommandContexts.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Application/ApplicationCommandIntegrationTypes.cs b/DisCatSharp/Enums/Application/ApplicationCommandIntegrationTypes.cs
index 6e5de27a26..51e7c346cc 100644
--- a/DisCatSharp/Enums/Application/ApplicationCommandIntegrationTypes.cs
+++ b/DisCatSharp/Enums/Application/ApplicationCommandIntegrationTypes.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Application/ApplicationCommandOptionType.cs b/DisCatSharp/Enums/Application/ApplicationCommandOptionType.cs
index 983352a5e4..1639e4e80a 100644
--- a/DisCatSharp/Enums/Application/ApplicationCommandOptionType.cs
+++ b/DisCatSharp/Enums/Application/ApplicationCommandOptionType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Application/ApplicationCommandType.cs b/DisCatSharp/Enums/Application/ApplicationCommandType.cs
index a0ff17514d..dafa2f9ac7 100644
--- a/DisCatSharp/Enums/Application/ApplicationCommandType.cs
+++ b/DisCatSharp/Enums/Application/ApplicationCommandType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Application/ApplicationDiscoverabilityState.cs b/DisCatSharp/Enums/Application/ApplicationDiscoverabilityState.cs
index 29ce733499..ad7bbe5393 100644
--- a/DisCatSharp/Enums/Application/ApplicationDiscoverabilityState.cs
+++ b/DisCatSharp/Enums/Application/ApplicationDiscoverabilityState.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Application/ApplicationDiscoveryEligibilityFlags.cs b/DisCatSharp/Enums/Application/ApplicationDiscoveryEligibilityFlags.cs
index 7b58c5a471..d862b5d1bd 100644
--- a/DisCatSharp/Enums/Application/ApplicationDiscoveryEligibilityFlags.cs
+++ b/DisCatSharp/Enums/Application/ApplicationDiscoveryEligibilityFlags.cs
@@ -25,85 +25,85 @@ public enum ApplicationDiscoveryEligibilityFlags : long
 	/// <summary>
 	/// Application is verified.
 	/// </summary>
-	Verified = 1<<0,
+	Verified = 1 << 0,
 
 	/// <summary>
 	/// Application has at least one tag set.
 	/// </summary>
-	Tag = 1<<1,
+	Tag = 1 << 1,
 
 	/// <summary>
 	/// Application has a description.
 	/// </summary>
-	Description = 1<<2,
+	Description = 1 << 2,
 
 	/// <summary>
 	/// Applications has a terms of service.
 	/// </summary>
-	TermsOfService = 1<<3,
+	TermsOfService = 1 << 3,
 
 	/// <summary>
 	/// Application has a privacy policy.
 	/// </summary>
-	PrivacyPolicy = 1<<4,
+	PrivacyPolicy = 1 << 4,
 
 	/// <summary>
 	/// Application has custom install url or install params.
 	/// </summary>
-	InstallParams = 1<<5,
+	InstallParams = 1 << 5,
 
 	/// <summary>
 	/// Application's name is safe for work.
 	/// </summary>
-	SafeName = 1<<6,
+	SafeName = 1 << 6,
 
 	/// <summary>
 	/// Application's description is safe for work.
 	/// </summary>
-	SafeDescription = 1<<7,
+	SafeDescription = 1 << 7,
 
 	/// <summary>
 	/// Application has the message content approved or utilizes application commands.
 	/// </summary>
-	ApprovedCommandsOrMessageContent = 1<<8,
+	ApprovedCommandsOrMessageContent = 1 << 8,
 
 	/// <summary>
 	/// Application has a support guild set.
 	/// </summary>
-	SupportGuild = 1<<9,
+	SupportGuild = 1 << 9,
 
 	/// <summary>
 	/// Application's commands are safe for work.
 	/// </summary>
-	SafeCommands = 1<<10,
+	SafeCommands = 1 << 10,
 
 	/// <summary>
 	/// Application's owner has MFA enabled.
 	/// </summary>
-	Mfa = 1<<11,
+	Mfa = 1 << 11,
 
 	/// <summary>
 	/// Application's directory long description is safe for work.
 	/// </summary>
-	SafeDirectoryOverview = 1<<12,
+	SafeDirectoryOverview = 1 << 12,
 
 	/// <summary>
 	/// Application has at least one supported locale set.
 	/// </summary>
-	SupportedLocales = 1<<13,
+	SupportedLocales = 1 << 13,
 
 	/// <summary>
 	/// Application's directory short description is safe for work.
 	/// </summary>
-	SafeShortDescription = 1<<14,
+	SafeShortDescription = 1 << 14,
 
 	/// <summary>
 	/// Application's role connections metadata is safe for work.
 	/// </summary>
-	SafeRoleConnections = 1<<15,
+	SafeRoleConnections = 1 << 15,
 
 	/// <summary>
 	/// Application has met all criteria and is eligible for discovery.
 	/// </summary>
-	Eligible = 1<<16
+	Eligible = 1 << 16
 }
diff --git a/DisCatSharp/Enums/Application/ApplicationFlags.cs b/DisCatSharp/Enums/Application/ApplicationFlags.cs
index 48f2a3e5aa..372c01bd6b 100644
--- a/DisCatSharp/Enums/Application/ApplicationFlags.cs
+++ b/DisCatSharp/Enums/Application/ApplicationFlags.cs
@@ -42,22 +42,22 @@ public enum ApplicationFlags : long
 	/// <summary>
 	/// Unknown.
 	/// </summary>
-	AutoModerationRuleCreateBadge = 1<<6,
+	AutoModerationRuleCreateBadge = 1 << 6,
 
 	/// <summary>
 	/// Allows the application to create activity assets.
 	/// </summary>
-	AllowAssets = 1L<<8,
+	AllowAssets = 1L << 8,
 
 	/// <summary>
 	/// Allows the application to enable activity spectating.
 	/// </summary>
-	AllowActivityActionSpectate = 1L<<9,
+	AllowActivityActionSpectate = 1L << 9,
 
 	/// <summary>
 	/// Allows the application to enable join requests for activities.
 	/// </summary>
-	AllowActivityActionJoinRequest = 1L<<10,
+	AllowActivityActionJoinRequest = 1L << 10,
 
 	/// <summary>
 	/// The application has connected to RPC.
diff --git a/DisCatSharp/Enums/Application/ApplicationInteractionsVersion.cs b/DisCatSharp/Enums/Application/ApplicationInteractionsVersion.cs
index 10c122f48b..7a80356c11 100644
--- a/DisCatSharp/Enums/Application/ApplicationInteractionsVersion.cs
+++ b/DisCatSharp/Enums/Application/ApplicationInteractionsVersion.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Application/ApplicationMonetizationEligibilityFlags.cs b/DisCatSharp/Enums/Application/ApplicationMonetizationEligibilityFlags.cs
index ea94fdbf47..9d1b2ea59d 100644
--- a/DisCatSharp/Enums/Application/ApplicationMonetizationEligibilityFlags.cs
+++ b/DisCatSharp/Enums/Application/ApplicationMonetizationEligibilityFlags.cs
@@ -25,95 +25,95 @@ public enum ApplicationMonetizationEligibilityFlags : long
 	/// <summary>
 	/// This application is verified
 	/// </summary>
-	Verified = 1<<0,
+	Verified = 1 << 0,
 
 	/// <summary>
 	/// This application is owned by a team
 	/// </summary>
-	HasTeam = 1<<1,
+	HasTeam = 1 << 1,
 
 	/// <summary>
 	/// This application has the message content intent approved or utilizes application commands
 	/// </summary>
-	ApprovedCommandsOrMessageContent = 1<<2,
+	ApprovedCommandsOrMessageContent = 1 << 2,
 
 	/// <summary>
 	/// This application has terms of service set
 	/// </summary>
-	TermsOfService = 1<<3,
+	TermsOfService = 1 << 3,
 
 	/// <summary>
 	/// This application has a privacy policy set
 	/// </summary>
-	PrivacyPolicy = 1<<4,
+	PrivacyPolicy = 1 << 4,
 
 	/// <summary>
 	/// This application's name is safe for work
 	/// </summary>
-	SafeName = 1<<5,
+	SafeName = 1 << 5,
 
 	/// <summary>
 	/// This application's description is safe for work
 	/// </summary>
-	SafeDescription = 1<<6,
+	SafeDescription = 1 << 6,
 
 	/// <summary>
 	/// This application's role connections metadata is safe for work
 	/// </summary>
-	HasSafeRoleConnections = 1<<7,
+	HasSafeRoleConnections = 1 << 7,
 
 	/// <summary>
 	/// The user is the owner of the team that owns the application
 	/// </summary>
-	UserIsTeamOwner = 1<<8,
+	UserIsTeamOwner = 1 << 8,
 
 	/// <summary>
 	/// This application is not quarantined
 	/// </summary>
-	NotQuarantined = 1<<9,
+	NotQuarantined = 1 << 9,
 
 	/// <summary>
 	/// The user's locale is supported by monetization
 	/// </summary>
-	UserLocaleSupported = 1<<10,
+	UserLocaleSupported = 1 << 10,
 
 	/// <summary>
 	/// The user is old enough to use monetization
 	/// </summary>
-	UserAgeSupported = 1<<11,
+	UserAgeSupported = 1 << 11,
 
 	/// <summary>
 	/// The user has a date of birth defined on their account
 	/// </summary>
-	UserDateOfBirthDefined = 1<<12,
+	UserDateOfBirthDefined = 1 << 12,
 
 	/// <summary>
 	/// The user has MFA enabled
 	/// </summary>
-	UserMfaEnabled = 1<<13,
+	UserMfaEnabled = 1 << 13,
 
 	/// <summary>
 	/// The user's email is verified
 	/// </summary>
-	UserEmailVerified = 1<<14,
+	UserEmailVerified = 1 << 14,
 
 	/// <summary>
 	/// All members of the team that owns the application have verified emails
 	/// </summary>
-	TeamMembersEmailVerified = 1<<15,
+	TeamMembersEmailVerified = 1 << 15,
 
 	/// <summary>
 	/// All members of the team that owns the application have MFA enabled
 	/// </summary>
-	TeamMembersMfaEnabled = 1<<16,
+	TeamMembersMfaEnabled = 1 << 16,
 
 	/// <summary>
 	/// This application has no issues blocking monetization
 	/// </summary>
-	NoBlockingIssues = 1<<17,
+	NoBlockingIssues = 1 << 17,
 
 	/// <summary>
 	/// The team has a valid payout status
 	/// </summary>
-	ValidPayoutStatus = 1<<18,
+	ValidPayoutStatus = 1 << 18
 }
diff --git a/DisCatSharp/Enums/Application/ApplicationMonetizationState.cs b/DisCatSharp/Enums/Application/ApplicationMonetizationState.cs
index a4b17e4ebd..fb6d58e97d 100644
--- a/DisCatSharp/Enums/Application/ApplicationMonetizationState.cs
+++ b/DisCatSharp/Enums/Application/ApplicationMonetizationState.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Application/ApplicationRoleConnectionMetadataType.cs b/DisCatSharp/Enums/Application/ApplicationRoleConnectionMetadataType.cs
index d62386c4fe..074aac0323 100644
--- a/DisCatSharp/Enums/Application/ApplicationRoleConnectionMetadataType.cs
+++ b/DisCatSharp/Enums/Application/ApplicationRoleConnectionMetadataType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Application/ApplicationVerificationState.cs b/DisCatSharp/Enums/Application/ApplicationVerificationState.cs
index 1f7dbb7d93..a601629a63 100644
--- a/DisCatSharp/Enums/Application/ApplicationVerificationState.cs
+++ b/DisCatSharp/Enums/Application/ApplicationVerificationState.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Application/ExplicitContentFilterLevel.cs b/DisCatSharp/Enums/Application/ExplicitContentFilterLevel.cs
index 58d2c90e7c..e69667b5fb 100644
--- a/DisCatSharp/Enums/Application/ExplicitContentFilterLevel.cs
+++ b/DisCatSharp/Enums/Application/ExplicitContentFilterLevel.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Application/RpcApplicationState.cs b/DisCatSharp/Enums/Application/RpcApplicationState.cs
index 73aba9c71a..cd4cb5582b 100644
--- a/DisCatSharp/Enums/Application/RpcApplicationState.cs
+++ b/DisCatSharp/Enums/Application/RpcApplicationState.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Application/StoreApplicationState.cs b/DisCatSharp/Enums/Application/StoreApplicationState.cs
index 6a6f3ea7be..66850834bc 100644
--- a/DisCatSharp/Enums/Application/StoreApplicationState.cs
+++ b/DisCatSharp/Enums/Application/StoreApplicationState.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Channel/ChannelFlags.cs b/DisCatSharp/Enums/Channel/ChannelFlags.cs
index ea1e319f27..f7a1f6cddd 100644
--- a/DisCatSharp/Enums/Channel/ChannelFlags.cs
+++ b/DisCatSharp/Enums/Channel/ChannelFlags.cs
@@ -31,6 +31,7 @@ public enum ChannelFlags : long
 	/// </summary>
 	[DiscordDeprecated]
 	RemovedFromHome = 1L << 0,
+
 	[DiscordDeprecated]
 	RemovedFromHighlights = RemovedFromHome,
 
@@ -105,7 +106,7 @@ public enum ChannelFlags : long
 	/// </summary>
 	[DiscordInExperiment]
 	IsBroadcasting = 1L << 14,
-	
+
 	/// <summary>
 	/// Hides the media download options for <see cref="ChannelType.GuildMedia"/> channels.
 	/// </summary>
diff --git a/DisCatSharp/Enums/Channel/ChannelType.cs b/DisCatSharp/Enums/Channel/ChannelType.cs
index 6a5670d87d..c0754c946e 100644
--- a/DisCatSharp/Enums/Channel/ChannelType.cs
+++ b/DisCatSharp/Enums/Channel/ChannelType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Channel/DirectoryCategory.cs b/DisCatSharp/Enums/Channel/DirectoryCategory.cs
index 10f8528a6d..32aa3e432f 100644
--- a/DisCatSharp/Enums/Channel/DirectoryCategory.cs
+++ b/DisCatSharp/Enums/Channel/DirectoryCategory.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Channel/OverwriteType.cs b/DisCatSharp/Enums/Channel/OverwriteType.cs
index db593cf7c4..4f31968dd5 100644
--- a/DisCatSharp/Enums/Channel/OverwriteType.cs
+++ b/DisCatSharp/Enums/Channel/OverwriteType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
@@ -14,5 +13,5 @@ public enum OverwriteType : int
 	/// <summary>
 	/// Specifies that this overwrite applies to a member.
 	/// </summary>
-	Member = 1,
+	Member = 1
 }
diff --git a/DisCatSharp/Enums/Channel/VideoQualityMode.cs b/DisCatSharp/Enums/Channel/VideoQualityMode.cs
index a75ed8b7a0..2c310e5df7 100644
--- a/DisCatSharp/Enums/Channel/VideoQualityMode.cs
+++ b/DisCatSharp/Enums/Channel/VideoQualityMode.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
@@ -14,5 +13,5 @@ public enum VideoQualityMode : int
 	/// <summary>
 	/// Indicates that the video quality is 720p.
 	/// </summary>
-	Full = 2,
+	Full = 2
 }
diff --git a/DisCatSharp/Enums/Discord/ApiChannel.cs b/DisCatSharp/Enums/Discord/ApiChannel.cs
index fbc2a40896..e6e0381186 100644
--- a/DisCatSharp/Enums/Discord/ApiChannel.cs
+++ b/DisCatSharp/Enums/Discord/ApiChannel.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Discord/DiscordDomain.cs b/DisCatSharp/Enums/Discord/DiscordDomain.cs
index 30f2fc11a4..f27cb1cec9 100644
--- a/DisCatSharp/Enums/Discord/DiscordDomain.cs
+++ b/DisCatSharp/Enums/Discord/DiscordDomain.cs
@@ -120,8 +120,7 @@ public enum CoreDomain
 	/// cdn.discordapp.com
 	/// </summary>
 	[DomainHelp("CDN", "cdn.discordapp.com")]
-	DiscordCdn = 19,
-
+	DiscordCdn = 19
 }
 
 /// <summary>
@@ -162,15 +161,13 @@ public enum UnusedDomain
 	/// <summary>
 	/// discordapp.io
 	/// </summary>
-	[Obsolete("Not in use.", false)]
-	[DomainHelp("IO domain for discord", "discordapp.io")]
+	[Obsolete("Not in use.", false), DomainHelp("IO domain for discord", "discordapp.io")]
 	DiscordAppIo = 1,
 
 	/// <summary>
 	/// discordcdn.com
 	/// </summary>
-	[Obsolete("Not in use.", false)]
-	[DomainHelp("Alternative CDN domain", "discordcdn.com")]
+	[Obsolete("Not in use.", false), DomainHelp("Alternative CDN domain", "discordcdn.com")]
 	DiscordCdnCom = 2
 }
 
diff --git a/DisCatSharp/Enums/Discord/DiscordEvent.cs b/DisCatSharp/Enums/Discord/DiscordEvent.cs
index e9f903e1c4..a0aa49ed99 100644
--- a/DisCatSharp/Enums/Discord/DiscordEvent.cs
+++ b/DisCatSharp/Enums/Discord/DiscordEvent.cs
@@ -1,4 +1,3 @@
-
 #nullable enable
 using System;
 
@@ -27,7 +26,8 @@ public EventAttribute(DiscordEvent evtn)
 /// Classes marked with this attribute will be considered for event handler registration from an assembly.
 /// </summary>
 [AttributeUsage(AttributeTargets.Class, Inherited = false)]
-public class EventHandlerAttribute : Attribute { }
+public class EventHandlerAttribute : Attribute
+{ }
 
 /// <summary>
 /// All events available in <see cref="DiscordClient"/> for use with <see cref="EventAttribute"/>.
@@ -120,7 +120,7 @@ public enum DiscordEvent
 	AutomodRuleDeleted,
 	AutomodActionExecuted,
 	GuildAuditLogEntryCreated,
- 	VoiceChannelStatusUpdated,
+	VoiceChannelStatusUpdated,
 	EntitlementCreated,
 	EntitlementUpdated,
 	EntitlementDeleted
diff --git a/DisCatSharp/Enums/Discord/DiscordIntents.cs b/DisCatSharp/Enums/Discord/DiscordIntents.cs
index b402e91710..f7dfffac34 100644
--- a/DisCatSharp/Enums/Discord/DiscordIntents.cs
+++ b/DisCatSharp/Enums/Discord/DiscordIntents.cs
@@ -41,7 +41,6 @@ public static DiscordIntents RemoveIntent(this DiscordIntents intents, DiscordIn
 	internal static bool HasAllPrivilegedIntents(this DiscordIntents intents)
 		=> intents.HasIntent(DiscordIntents.GuildMembers | DiscordIntents.GuildPresences | DiscordIntents.MessageContent);
 
-
 	/// <summary>
 	/// Whether it has all v9 privileged intents.
 	/// </summary>
@@ -192,7 +191,7 @@ public enum DiscordIntents
 	/// <para>These are all intents excluding <see cref="GuildMembers"/>, <see cref="GuildPresences"/> and <see cref="MessageContent"/>.</para>
 	/// </summary>
 	AllUnprivileged = Guilds | GuildModeration | GuildEmojisAndStickers | GuildIntegrations | GuildWebhooks | GuildInvites | GuildVoiceStates | GuildMessages |
-		GuildMessageReactions | GuildMessageTyping | DirectMessages | DirectMessageReactions | DirectMessageTyping | GuildScheduledEvents | AutoModerationConfiguration | AutoModerationExecution,
+	                  GuildMessageReactions | GuildMessageTyping | DirectMessages | DirectMessageReactions | DirectMessageTyping | GuildScheduledEvents | AutoModerationConfiguration | AutoModerationExecution,
 
 	/// <summary>
 	/// Includes all intents.
diff --git a/DisCatSharp/Enums/Discord/DiscordShortlink.cs b/DisCatSharp/Enums/Discord/DiscordShortlink.cs
index 435120ed78..43da6e4ea5 100644
--- a/DisCatSharp/Enums/Discord/DiscordShortlink.cs
+++ b/DisCatSharp/Enums/Discord/DiscordShortlink.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Discord/GatewayCompressionLevel.cs b/DisCatSharp/Enums/Discord/GatewayCompressionLevel.cs
index d30a86220f..e4a949fdcc 100644
--- a/DisCatSharp/Enums/Discord/GatewayCompressionLevel.cs
+++ b/DisCatSharp/Enums/Discord/GatewayCompressionLevel.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Discord/OAuth.cs b/DisCatSharp/Enums/Discord/OAuth.cs
index feeb5b366f..c8f386484c 100644
--- a/DisCatSharp/Enums/Discord/OAuth.cs
+++ b/DisCatSharp/Enums/Discord/OAuth.cs
@@ -1,4 +1,3 @@
-
 // ReSharper disable InconsistentNaming
 
 namespace DisCatSharp.Enums;
@@ -57,9 +56,10 @@ public static string ResolveScopes(OAuthScopes scope) =>
 			OAuthScopes.IDENTIFY_BASIC => IDENTIFY_BASIC,
 			OAuthScopes.IDENTIFY_EXTENDED => IDENTIFY_EXTENDED,
 			OAuthScopes.ALL => ALL,
-			_ => BOT_DEFAULT,
+			_ => BOT_DEFAULT
 		};
 }
+
 /// <summary>
 /// The oauth scopes.
 /// </summary>
diff --git a/DisCatSharp/Enums/Discord/TokenType.cs b/DisCatSharp/Enums/Discord/TokenType.cs
index d380835d82..9af2e3172b 100644
--- a/DisCatSharp/Enums/Discord/TokenType.cs
+++ b/DisCatSharp/Enums/Discord/TokenType.cs
@@ -11,7 +11,7 @@ public enum TokenType
 	/// User token type
 	/// </summary>
 	[Obsolete("Logging in with a user token may result in your account being terminated, and is therefore highly unrecommended." +
-		"\nIf anything goes wrong with this, we will not provide any support!", true)]
+	          "\nIf anything goes wrong with this, we will not provide any support!", true)]
 	User = 0,
 
 	/// <summary>
diff --git a/DisCatSharp/Enums/Guild/AuditLogActionCategory.cs b/DisCatSharp/Enums/Guild/AuditLog/AuditLogActionCategory.cs
similarity index 99%
rename from DisCatSharp/Enums/Guild/AuditLogActionCategory.cs
rename to DisCatSharp/Enums/Guild/AuditLog/AuditLogActionCategory.cs
index cfc78901d5..c8ea06cffc 100644
--- a/DisCatSharp/Enums/Guild/AuditLogActionCategory.cs
+++ b/DisCatSharp/Enums/Guild/AuditLog/AuditLogActionCategory.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/AuditLogActionType.cs b/DisCatSharp/Enums/Guild/AuditLog/AuditLogActionType.cs
similarity index 57%
rename from DisCatSharp/Enums/Guild/AuditLogActionType.cs
rename to DisCatSharp/Enums/Guild/AuditLog/AuditLogActionType.cs
index 4b4824045c..0ff4d2978b 100644
--- a/DisCatSharp/Enums/Guild/AuditLogActionType.cs
+++ b/DisCatSharp/Enums/Guild/AuditLog/AuditLogActionType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
@@ -17,72 +16,72 @@ public enum AuditLogActionType
 	GuildUpdate = 1,
 
 	/// <summary>
-	/// Indicates that the channel was created.
+	/// Indicates that a channel was created.
 	/// </summary>
 	ChannelCreate = 10,
 
 	/// <summary>
-	/// Indicates that the channel was updated.
+	/// Indicates that a channel was updated.
 	/// </summary>
 	ChannelUpdate = 11,
 
 	/// <summary>
-	/// Indicates that the channel was deleted.
+	/// Indicates that a channel was deleted.
 	/// </summary>
 	ChannelDelete = 12,
 
 	/// <summary>
-	/// Indicates that the channel permission overwrite was created.
+	/// Indicates that a channel permission overwrite was created.
 	/// </summary>
-	OverwriteCreate = 13,
+	ChannelOverwriteCreate = 13,
 
 	/// <summary>
-	/// Indicates that the channel permission overwrite was updated.
+	/// Indicates that a channel permission overwrite was updated.
 	/// </summary>
-	OverwriteUpdate = 14,
+	ChannelOverwriteUpdate = 14,
 
 	/// <summary>
-	/// Indicates that the channel permission overwrite was deleted.
+	/// Indicates that a channel permission overwrite was deleted.
 	/// </summary>
-	OverwriteDelete = 15,
+	ChannelOverwriteDelete = 15,
 
 	/// <summary>
-	/// Indicates that the user was kicked.
+	/// Indicates that a user was kicked.
 	/// </summary>
-	Kick = 20,
+	MemberKick = 20,
 
 	/// <summary>
 	/// Indicates that users were pruned.
 	/// </summary>
-	Prune = 21,
+	MemberPrune = 21,
 
 	/// <summary>
-	/// Indicates that the user was banned.
+	/// Indicates that a user was banned.
 	/// </summary>
-	Ban = 22,
+	MemberBanAdd = 22,
 
 	/// <summary>
-	/// Indicates that the user was unbanned.
+	/// Indicates that a user was unbanned.
 	/// </summary>
-	Unban = 23,
+	MemberBanRemove = 23,
 
 	/// <summary>
-	/// Indicates that the member was updated.
+	/// Indicates that a member was updated.
 	/// </summary>
 	MemberUpdate = 24,
 
 	/// <summary>
-	/// Indicates that the member's roles were updated.
+	/// Indicates that a member's roles were updated.
 	/// </summary>
 	MemberRoleUpdate = 25,
 
 	/// <summary>
-	/// Indicates that the member has moved to another voice channel.
+	/// Indicates that a member was moved to another voice channel.
 	/// </summary>
 	MemberMove = 26,
 
 	/// <summary>
-	/// Indicates that the member has disconnected from a voice channel.
+	/// Indicates that a member was disconnected from a voice channel.
 	/// </summary>
 	MemberDisconnect = 27,
 
@@ -92,47 +91,47 @@ public enum AuditLogActionType
 	BotAdd = 28,
 
 	/// <summary>
-	/// Indicates that the role was created.
+	/// Indicates that a role was created.
 	/// </summary>
 	RoleCreate = 30,
 
 	/// <summary>
-	/// Indicates that the role was updated.
+	/// Indicates that a role was updated.
 	/// </summary>
 	RoleUpdate = 31,
 
 	/// <summary>
-	/// Indicates that the role was deleted.
+	/// Indicates that a role was deleted.
 	/// </summary>
 	RoleDelete = 32,
 
 	/// <summary>
-	/// Indicates that the invite was created.
+	/// Indicates that an invite was created.
 	/// </summary>
 	InviteCreate = 40,
 
 	/// <summary>
-	/// Indicates that the invite was updated.
+	/// Indicates that an invite was updated.
 	/// </summary>
 	InviteUpdate = 41,
 
 	/// <summary>
-	/// Indicates that the invite was deleted.
+	/// Indicates that an invite was deleted.
 	/// </summary>
 	InviteDelete = 42,
 
 	/// <summary>
-	/// Indicates that the webhook was created.
+	/// Indicates that a webhook was created.
 	/// </summary>
 	WebhookCreate = 50,
 
 	/// <summary>
-	/// Indicates that the webook was updated.
+	/// Indicates that a webook was updated.
 	/// </summary>
 	WebhookUpdate = 51,
 
 	/// <summary>
-	/// Indicates that the webhook was deleted.
+	/// Indicates that a webhook was deleted.
 	/// </summary>
 	WebhookDelete = 52,
 
@@ -152,7 +151,7 @@ public enum AuditLogActionType
 	EmojiDelete = 62,
 
 	/// <summary>
-	/// Indicates that the message was deleted.
+	/// Indicates that a message was deleted.
 	/// </summary>
 	MessageDelete = 72,
 
@@ -187,32 +186,32 @@ public enum AuditLogActionType
 	IntegrationDelete = 82,
 
 	/// <summary>
-	/// Indicates that an stage instance was created.
+	/// Indicates that a stage instance was created.
 	/// </summary>
 	StageInstanceCreate = 83,
 
 	/// <summary>
-	/// Indicates that an stage instance was updated.
+	/// Indicates that a stage instance was updated.
 	/// </summary>
 	StageInstanceUpdate = 84,
 
 	/// <summary>
-	/// Indicates that an stage instance was deleted.
+	/// Indicates that a stage instance was deleted.
 	/// </summary>
 	StageInstanceDelete = 85,
 
 	/// <summary>
-	/// Indicates that an sticker was created.
+	/// Indicates that a sticker was created.
 	/// </summary>
 	StickerCreate = 90,
 
 	/// <summary>
-	/// Indicates that an sticker was updated.
+	/// Indicates that a sticker was updated.
 	/// </summary>
 	StickerUpdate = 91,
 
 	/// <summary>
-	/// Indicates that an sticker was deleted.
+	/// Indicates that a sticker was deleted.
 	/// </summary>
 	StickerDelete = 92,
 
@@ -232,37 +231,37 @@ public enum AuditLogActionType
 	GuildScheduledEventDelete = 102,
 
 	/// <summary>
-	/// Indicates that an thread was created.
+	/// Indicates that a thread was created.
 	/// </summary>
 	ThreadCreate = 110,
 
 	/// <summary>
-	/// Indicates that an thread was updated.
+	/// Indicates that a thread was updated.
 	/// </summary>
 	ThreadUpdate = 111,
 
 	/// <summary>
-	/// Indicates that an thread was deleted.
+	/// Indicates that a thread was deleted.
 	/// </summary>
 	ThreadDelete = 112,
 
 	/// <summary>
-	/// Indicates that the permissions for an application command was updated.
+	/// Indicates that permissions for an application command were updated.
 	/// </summary>
 	ApplicationCommandPermissionUpdate = 121,
 
 	/// <summary>
-	/// Indicates that a new automod rule has been added.
+	/// Indicates that an automod rule has been added.
 	/// </summary>
 	AutoModerationRuleCreate = 140,
 
 	/// <summary>
-	/// Indicates that a automod rule has been updated.
+	/// Indicates that an automod rule has been updated.
 	/// </summary>
 	AutoModerationRuleUpdate = 141,
 
 	/// <summary>
-	/// Indicates that a automod rule has been deleted.
+	/// Indicates that an automod rule has been deleted.
 	/// </summary>
 	AutoModerationRuleDelete = 142,
 
@@ -274,22 +273,66 @@ public enum AuditLogActionType
 	/// <summary>
 	/// Indicates that automod flagged a message.
 	/// </summary>
-	AutoModerationFlagMessage = 144,
+	AutoModerationFlagToChannel = 144,
 
 	/// <summary>
 	/// Indicates that automod timed out a user.
 	/// </summary>
-	AutoModerationTimeOutUser = 145,
+	AutoModerationUserCommunicationDisabled = 145,
 
 	/// <summary>
 	/// Indicates that automod quarantined a user.
 	/// </summary>
 	AutoModerationQuarantineUser = 146,
 
+	/// <summary>
+	/// Indicates that a creator monetization request was created.
+	/// </summary>
+	CreatorMonetizationRequestCreated = 150,
+
+	/// <summary>
+	/// Indicates that the creator monetization terms were accepted.
+	/// </summary>
+	CreatorMonetizationTermsAccepted = 151,
+
+	/// <summary>
+	/// Indicates that an onboarding question was created.
+	/// </summary>
 	OnboardingQuestionCreate = 163,
+
+	/// <summary>
+	/// Indicates that an onboarding question was updated.
+	/// </summary>
 	OnboardingQuestionUpdate = 164,
+
+	/// <summary>
+	/// Indicates that the onboarding was updated.
+	/// </summary>
 	OnboardingUpdate = 167,
+
+	/// <summary>
+	/// Indicates that the server guide was created.
+	/// </summary>
 	ServerGuideCreate = 190,
+
+	/// <summary>
+	/// Indicates that the server guide was updated.
+	/// </summary>
 	ServerGuideUpdate = 191,
-	VoiceChannelStatusUpdate = 192
+
+	/// <summary>
+	/// Indicates that a voice channel status was updated.
+	/// </summary>
+	VoiceChannelStatusUpdate = 192,
+
+	/// <summary>
+	/// Indicates that a voice channel status was deleted.
+	/// </summary>
+	VoiceChannelStatusDelete = 193,
+
+	/// <summary>
+	/// Indicates that the Clyde AI profile was updated.
+	/// </summary>
+	// ReSharper disable once InconsistentNaming
+	ClydeAIProfileUpdate = 194
 }
diff --git a/DisCatSharp/Enums/Guild/Automod/AutomodActionType.cs b/DisCatSharp/Enums/Guild/Automod/AutomodActionType.cs
index 9302de1f9f..4972a3aa68 100644
--- a/DisCatSharp/Enums/Guild/Automod/AutomodActionType.cs
+++ b/DisCatSharp/Enums/Guild/Automod/AutomodActionType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/Automod/AutomodEventType.cs b/DisCatSharp/Enums/Guild/Automod/AutomodEventType.cs
index 20b46b8401..dfdbda0f48 100644
--- a/DisCatSharp/Enums/Guild/Automod/AutomodEventType.cs
+++ b/DisCatSharp/Enums/Guild/Automod/AutomodEventType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/Automod/AutomodKeywordPresetType.cs b/DisCatSharp/Enums/Guild/Automod/AutomodKeywordPresetType.cs
index e980a98f08..a72215af00 100644
--- a/DisCatSharp/Enums/Guild/Automod/AutomodKeywordPresetType.cs
+++ b/DisCatSharp/Enums/Guild/Automod/AutomodKeywordPresetType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/DefaultMessageNotifications.cs b/DisCatSharp/Enums/Guild/DefaultMessageNotifications.cs
index 49562bb672..789166c8c9 100644
--- a/DisCatSharp/Enums/Guild/DefaultMessageNotifications.cs
+++ b/DisCatSharp/Enums/Guild/DefaultMessageNotifications.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/ExplicitContentFilter.cs b/DisCatSharp/Enums/Guild/ExplicitContentFilter.cs
index 6f000602c7..1fad0381c3 100644
--- a/DisCatSharp/Enums/Guild/ExplicitContentFilter.cs
+++ b/DisCatSharp/Enums/Guild/ExplicitContentFilter.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/HubType.cs b/DisCatSharp/Enums/Guild/HubType.cs
index 2818366b2b..a02b68cf4d 100644
--- a/DisCatSharp/Enums/Guild/HubType.cs
+++ b/DisCatSharp/Enums/Guild/HubType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/MemberFlags.cs b/DisCatSharp/Enums/Guild/MemberFlags.cs
index 13895a729d..d44e3b3ddd 100644
--- a/DisCatSharp/Enums/Guild/MemberFlags.cs
+++ b/DisCatSharp/Enums/Guild/MemberFlags.cs
@@ -45,6 +45,7 @@ public enum MemberFlags : long
 	/// </summary>
 	[DiscordInExperiment]
 	BypassesVerification = 1 << 2,
+
 	[DiscordInExperiment]
 	Verified = BypassesVerification,
 
@@ -77,12 +78,11 @@ public enum MemberFlags : long
 	/// Members username or nickname contains words that are not allowed.
 	/// </summary>
 	[DiscordInExperiment]
-	AutomodQuarantinedUsernameOrGuildNickname = 1<<7,
+	AutomodQuarantinedUsernameOrGuildNickname = 1 << 7,
 
 	/// <summary>
 	/// Members user or guild bio contains words that are not allowed.
 	/// </summary>
 	[DiscordInExperiment]
-	AutomodQuarantinedBio = 1<<8
+	AutomodQuarantinedBio = 1 << 8
 }
-
diff --git a/DisCatSharp/Enums/Guild/MfaLevel.cs b/DisCatSharp/Enums/Guild/MfaLevel.cs
index 2000bb2f5b..d9cf269137 100644
--- a/DisCatSharp/Enums/Guild/MfaLevel.cs
+++ b/DisCatSharp/Enums/Guild/MfaLevel.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/NsfwLevel.cs b/DisCatSharp/Enums/Guild/NsfwLevel.cs
index f129f0f384..15514a9fd6 100644
--- a/DisCatSharp/Enums/Guild/NsfwLevel.cs
+++ b/DisCatSharp/Enums/Guild/NsfwLevel.cs
@@ -1,4 +1,3 @@
-
 // ReSharper disable InconsistentNaming
 
 namespace DisCatSharp.Enums;
diff --git a/DisCatSharp/Enums/Guild/Onboarding/NewMemberActionType.cs b/DisCatSharp/Enums/Guild/Onboarding/NewMemberActionType.cs
index 4054629d5e..68a74b728b 100644
--- a/DisCatSharp/Enums/Guild/Onboarding/NewMemberActionType.cs
+++ b/DisCatSharp/Enums/Guild/Onboarding/NewMemberActionType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/Onboarding/OnboardingMode.cs b/DisCatSharp/Enums/Guild/Onboarding/OnboardingMode.cs
index 85cd1b3f2c..27b8e8246d 100644
--- a/DisCatSharp/Enums/Guild/Onboarding/OnboardingMode.cs
+++ b/DisCatSharp/Enums/Guild/Onboarding/OnboardingMode.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/Onboarding/PromptType.cs b/DisCatSharp/Enums/Guild/Onboarding/PromptType.cs
index 239850aac5..101c34b654 100644
--- a/DisCatSharp/Enums/Guild/Onboarding/PromptType.cs
+++ b/DisCatSharp/Enums/Guild/Onboarding/PromptType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/Permission.cs b/DisCatSharp/Enums/Guild/Permission.cs
index c3105a26c6..c1a66d4d10 100644
--- a/DisCatSharp/Enums/Guild/Permission.cs
+++ b/DisCatSharp/Enums/Guild/Permission.cs
@@ -138,7 +138,7 @@ public enum Permissions : long
 	/// Allows the user to go live.
 	/// </summary>
 	[PermissionString("Allow Stream")]
-	Stream  = 1L << 9,
+	Stream = 1L << 9,
 
 	/// <summary>
 	/// Allows accessing text and voice channels. Disabling this permission hides channels.
@@ -366,7 +366,7 @@ public enum Permissions : long
 	/// Allows members to interact with the Clyde AI bot.
 	/// </summary>
 	[PermissionString("Use Clyde AI"), DiscordInExperiment]
- 	UseClydeAi = 1L<<47,
+	UseClydeAi = 1L << 47,
 
 	/// <summary>
 	/// Allows members to create and edit voice channel status.
diff --git a/DisCatSharp/Enums/Guild/PremiumTier.cs b/DisCatSharp/Enums/Guild/PremiumTier.cs
index 532c5702f5..4e56289a2a 100644
--- a/DisCatSharp/Enums/Guild/PremiumTier.cs
+++ b/DisCatSharp/Enums/Guild/PremiumTier.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/PriceTierType.cs b/DisCatSharp/Enums/Guild/PriceTierType.cs
index 88a1c2697a..b8ba1258c6 100644
--- a/DisCatSharp/Enums/Guild/PriceTierType.cs
+++ b/DisCatSharp/Enums/Guild/PriceTierType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/RoleFlags.cs b/DisCatSharp/Enums/Guild/RoleFlags.cs
index 51ce13d745..febce8d2eb 100644
--- a/DisCatSharp/Enums/Guild/RoleFlags.cs
+++ b/DisCatSharp/Enums/Guild/RoleFlags.cs
@@ -16,6 +16,5 @@ public enum RoleFlags
 	/// <summary>
 	/// This role is in a prompt.
 	/// </summary>
-	InPrompt = 1 << 0,
+	InPrompt = 1 << 0
 }
-
diff --git a/DisCatSharp/Enums/Guild/ScheduledEvent/ScheduledEventEntityType.cs b/DisCatSharp/Enums/Guild/ScheduledEvent/ScheduledEventEntityType.cs
index fd3d1420a1..eaceed2a60 100644
--- a/DisCatSharp/Enums/Guild/ScheduledEvent/ScheduledEventEntityType.cs
+++ b/DisCatSharp/Enums/Guild/ScheduledEvent/ScheduledEventEntityType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/ScheduledEvent/ScheduledEventStatus.cs b/DisCatSharp/Enums/Guild/ScheduledEvent/ScheduledEventStatus.cs
index 32b465c2e2..9b66613adf 100644
--- a/DisCatSharp/Enums/Guild/ScheduledEvent/ScheduledEventStatus.cs
+++ b/DisCatSharp/Enums/Guild/ScheduledEvent/ScheduledEventStatus.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/SystemChannelFlags.cs b/DisCatSharp/Enums/Guild/SystemChannelFlags.cs
index 322992f241..3845e6299f 100644
--- a/DisCatSharp/Enums/Guild/SystemChannelFlags.cs
+++ b/DisCatSharp/Enums/Guild/SystemChannelFlags.cs
@@ -45,10 +45,10 @@ public enum SystemChannelFlags
 	/// <summary>
 	/// Role subscription purchase messages are disabled.
 	/// </summary>
-	SuppressRoleSubbscriptionPurchaseNotification = 1<<4,
+	SuppressRoleSubbscriptionPurchaseNotification = 1 << 4,
 
 	/// <summary>
 	/// Suppress role subscription purchase sticker replies.
 	/// </summary>
-	SuppressRoleSubbscriptionPurchaseNotificationReplies = 1<<5,
+	SuppressRoleSubbscriptionPurchaseNotificationReplies = 1 << 5
 }
diff --git a/DisCatSharp/Enums/Guild/ThreadAndForum/ForumLayout.cs b/DisCatSharp/Enums/Guild/ThreadAndForum/ForumLayout.cs
index 0dfdc50f73..ec214c4d86 100644
--- a/DisCatSharp/Enums/Guild/ThreadAndForum/ForumLayout.cs
+++ b/DisCatSharp/Enums/Guild/ThreadAndForum/ForumLayout.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/ThreadAndForum/ForumPostSortOrder.cs b/DisCatSharp/Enums/Guild/ThreadAndForum/ForumPostSortOrder.cs
index 8e4976a92b..d1c4aebe7e 100644
--- a/DisCatSharp/Enums/Guild/ThreadAndForum/ForumPostSortOrder.cs
+++ b/DisCatSharp/Enums/Guild/ThreadAndForum/ForumPostSortOrder.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/ThreadAndForum/ThreadAutoArchiveDuration.cs b/DisCatSharp/Enums/Guild/ThreadAndForum/ThreadAutoArchiveDuration.cs
index f4a640723f..99c0ec91ab 100644
--- a/DisCatSharp/Enums/Guild/ThreadAndForum/ThreadAutoArchiveDuration.cs
+++ b/DisCatSharp/Enums/Guild/ThreadAndForum/ThreadAutoArchiveDuration.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/ThreadAndForum/ThreadMemberFlags.cs b/DisCatSharp/Enums/Guild/ThreadAndForum/ThreadMemberFlags.cs
index d2477b20f4..5fabe5f5f1 100644
--- a/DisCatSharp/Enums/Guild/ThreadAndForum/ThreadMemberFlags.cs
+++ b/DisCatSharp/Enums/Guild/ThreadAndForum/ThreadMemberFlags.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/VerificationLevel.cs b/DisCatSharp/Enums/Guild/VerificationLevel.cs
index f4f39c98c8..ab35c87164 100644
--- a/DisCatSharp/Enums/Guild/VerificationLevel.cs
+++ b/DisCatSharp/Enums/Guild/VerificationLevel.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Guild/WidgetType.cs b/DisCatSharp/Enums/Guild/WidgetType.cs
index d96add0487..9694ce9e93 100644
--- a/DisCatSharp/Enums/Guild/WidgetType.cs
+++ b/DisCatSharp/Enums/Guild/WidgetType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Integration/IntegrationExpireBehavior.cs b/DisCatSharp/Enums/Integration/IntegrationExpireBehavior.cs
index 4d572ea160..3a2cf352cc 100644
--- a/DisCatSharp/Enums/Integration/IntegrationExpireBehavior.cs
+++ b/DisCatSharp/Enums/Integration/IntegrationExpireBehavior.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Interaction/ButtonStyle.cs b/DisCatSharp/Enums/Interaction/ButtonStyle.cs
index f6ddb5d129..990883fbba 100644
--- a/DisCatSharp/Enums/Interaction/ButtonStyle.cs
+++ b/DisCatSharp/Enums/Interaction/ButtonStyle.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
@@ -19,7 +18,7 @@ public enum ButtonStyle : int
 	/// <summary>
 	/// Green button.
 	/// </summary>
-	Success  = 3,
+	Success = 3,
 
 	/// <summary>
 	/// Red button.
diff --git a/DisCatSharp/Enums/Interaction/ComponentType.cs b/DisCatSharp/Enums/Interaction/ComponentType.cs
index 709448047a..ce2b063cb6 100644
--- a/DisCatSharp/Enums/Interaction/ComponentType.cs
+++ b/DisCatSharp/Enums/Interaction/ComponentType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
@@ -44,5 +43,5 @@ public enum ComponentType
 	/// <summary>
 	/// A select menu to select channels.
 	/// </summary>
-	ChannelSelect = 8,
+	ChannelSelect = 8
 }
diff --git a/DisCatSharp/Enums/Interaction/IFrameModalSize.cs b/DisCatSharp/Enums/Interaction/IFrameModalSize.cs
index 22f0e62821..276f8cbca0 100644
--- a/DisCatSharp/Enums/Interaction/IFrameModalSize.cs
+++ b/DisCatSharp/Enums/Interaction/IFrameModalSize.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
@@ -19,5 +18,5 @@ public enum IframeModalSize : int
 	/// <summary>
 	/// Sends a big iFrame.
 	/// </summary>
-	Big  = 3
+	Big = 3
 }
diff --git a/DisCatSharp/Enums/Interaction/InteractionResponseType.cs b/DisCatSharp/Enums/Interaction/InteractionResponseType.cs
index 0f44cab0b7..d25209ac7b 100644
--- a/DisCatSharp/Enums/Interaction/InteractionResponseType.cs
+++ b/DisCatSharp/Enums/Interaction/InteractionResponseType.cs
@@ -51,7 +51,7 @@ public enum InteractionResponseType
 
 	/// <summary>
 	/// <para>Responds to the interaction with an iframe.</para>
-	/// <para><note type="warning">Can only be used if you are whitelisted..</note></para>
+	/// <para><note type="warning">Can only be used if you are whitelisted.</note></para>
 	/// </summary>
 	[DiscordInExperiment("Currently in closed beta."), Experimental("We provide this type but can't provide support.")]
 	Iframe = 11
diff --git a/DisCatSharp/Enums/Interaction/InteractionType.cs b/DisCatSharp/Enums/Interaction/InteractionType.cs
index 462cbda360..5d519e99b6 100644
--- a/DisCatSharp/Enums/Interaction/InteractionType.cs
+++ b/DisCatSharp/Enums/Interaction/InteractionType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Interaction/TextComponentStyle.cs b/DisCatSharp/Enums/Interaction/TextComponentStyle.cs
index a6a96fec6f..610941dc4f 100644
--- a/DisCatSharp/Enums/Interaction/TextComponentStyle.cs
+++ b/DisCatSharp/Enums/Interaction/TextComponentStyle.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Invite/InviteFlags.cs b/DisCatSharp/Enums/Invite/InviteFlags.cs
index c37b19a4b3..2bf2cfe511 100644
--- a/DisCatSharp/Enums/Invite/InviteFlags.cs
+++ b/DisCatSharp/Enums/Invite/InviteFlags.cs
@@ -28,10 +28,10 @@ public enum InviteFlags : int
 	/// Invite grants temporary guest membership.
 	/// All channels but the one invited to are hidden and user gets kicked if they leave the voice.
 	/// </summary>
-	GuestMembership = 1<<0,
+	GuestMembership = 1 << 0,
 
 	/// <summary>
 	/// The invite has been viewed by any user (has been retrieved using the get invite endpoint).
 	/// </summary>
-	Viewed = 1<<1
+	Viewed = 1 << 1
 }
diff --git a/DisCatSharp/Enums/Invite/InviteType.cs b/DisCatSharp/Enums/Invite/InviteType.cs
index 37d1c582d4..dccd50b0ad 100644
--- a/DisCatSharp/Enums/Invite/InviteType.cs
+++ b/DisCatSharp/Enums/Invite/InviteType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Invite/TargetType.cs b/DisCatSharp/Enums/Invite/TargetType.cs
index cb56c16e6a..15537c069c 100644
--- a/DisCatSharp/Enums/Invite/TargetType.cs
+++ b/DisCatSharp/Enums/Invite/TargetType.cs
@@ -1,8 +1,7 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
-/// Represents the invite type .
+/// Represents the invite type.
 /// </summary>
 public enum TargetType
 {
diff --git a/DisCatSharp/Enums/Message/AttachmentFlags.cs b/DisCatSharp/Enums/Message/AttachmentFlags.cs
index b4bd60aa6d..b5c32954a0 100644
--- a/DisCatSharp/Enums/Message/AttachmentFlags.cs
+++ b/DisCatSharp/Enums/Message/AttachmentFlags.cs
@@ -52,5 +52,5 @@ public enum AttachmentFlags
 	/// <summary>
 	/// This attachment contains explicit media.
 	/// </summary>
-	ContainsExplicitMedia = 1 << 4,
+	ContainsExplicitMedia = 1 << 4
 }
diff --git a/DisCatSharp/Enums/Message/MentionType.cs b/DisCatSharp/Enums/Message/MentionType.cs
index 0ce715e9e9..923c8a392e 100644
--- a/DisCatSharp/Enums/Message/MentionType.cs
+++ b/DisCatSharp/Enums/Message/MentionType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Message/MessageActivityType.cs b/DisCatSharp/Enums/Message/MessageActivityType.cs
index 63c801105b..6a70e68235 100644
--- a/DisCatSharp/Enums/Message/MessageActivityType.cs
+++ b/DisCatSharp/Enums/Message/MessageActivityType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Message/MessageType.cs b/DisCatSharp/Enums/Message/MessageType.cs
index 14028a8c7a..17cca04e9b 100644
--- a/DisCatSharp/Enums/Message/MessageType.cs
+++ b/DisCatSharp/Enums/Message/MessageType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
@@ -206,6 +205,11 @@ public enum MessageType : int
 	/// </summary>
 	GuildIncidentReportFalseAlarm = 39,
 
+	/// <summary>
+	/// Message indicating a poll was created.
+	/// </summary>
+	Poll = 43,
+
 	/// <summary>
 	/// Message indicating that a user bought something from the server shop.
 	/// </summary>
diff --git a/DisCatSharp/Enums/Message/TimestampFormat.cs b/DisCatSharp/Enums/Message/TimestampFormat.cs
index 6bd16d0c01..8f2d5812f6 100644
--- a/DisCatSharp/Enums/Message/TimestampFormat.cs
+++ b/DisCatSharp/Enums/Message/TimestampFormat.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Store/EntitlementOwnerType.cs b/DisCatSharp/Enums/Store/EntitlementOwnerType.cs
index 0017e696cb..42c9308bf7 100644
--- a/DisCatSharp/Enums/Store/EntitlementOwnerType.cs
+++ b/DisCatSharp/Enums/Store/EntitlementOwnerType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Store/EntitlementType.cs b/DisCatSharp/Enums/Store/EntitlementType.cs
index 1b681891e8..f560443d14 100644
--- a/DisCatSharp/Enums/Store/EntitlementType.cs
+++ b/DisCatSharp/Enums/Store/EntitlementType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Store/SkuAccessType.cs b/DisCatSharp/Enums/Store/SkuAccessType.cs
index c8cd661367..d015124dfc 100644
--- a/DisCatSharp/Enums/Store/SkuAccessType.cs
+++ b/DisCatSharp/Enums/Store/SkuAccessType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/Store/SkuType.cs b/DisCatSharp/Enums/Store/SkuType.cs
index 3fa5805304..e70c02c7bb 100644
--- a/DisCatSharp/Enums/Store/SkuType.cs
+++ b/DisCatSharp/Enums/Store/SkuType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/User/ConnectionMetadataVisibilityType.cs b/DisCatSharp/Enums/User/ConnectionMetadataVisibilityType.cs
index 63a5a473dc..53a9990f81 100644
--- a/DisCatSharp/Enums/User/ConnectionMetadataVisibilityType.cs
+++ b/DisCatSharp/Enums/User/ConnectionMetadataVisibilityType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/User/ConnectionVisibilityType.cs b/DisCatSharp/Enums/User/ConnectionVisibilityType.cs
index bf7acf3097..baa4afb1e4 100644
--- a/DisCatSharp/Enums/User/ConnectionVisibilityType.cs
+++ b/DisCatSharp/Enums/User/ConnectionVisibilityType.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Enums;
 
 /// <summary>
diff --git a/DisCatSharp/Enums/User/UserFlags.cs b/DisCatSharp/Enums/User/UserFlags.cs
index 1913e9dc9f..4d01070f04 100644
--- a/DisCatSharp/Enums/User/UserFlags.cs
+++ b/DisCatSharp/Enums/User/UserFlags.cs
@@ -195,5 +195,5 @@ public enum UserFlags : long
 	/// <summary>
 	/// User is a restricted collaborator and has staff permissions.
 	/// </summary>
-	RestrictedCollaborator = 1L << 51,
+	RestrictedCollaborator = 1L << 51
 }
diff --git a/DisCatSharp/Enums/Voice/SpeakingFlags.cs b/DisCatSharp/Enums/Voice/SpeakingFlags.cs
index c4dc766fd9..b1aee236c0 100644
--- a/DisCatSharp/Enums/Voice/SpeakingFlags.cs
+++ b/DisCatSharp/Enums/Voice/SpeakingFlags.cs
@@ -27,15 +27,15 @@ public enum SpeakingFlags : int
 	/// <summary>
 	/// Normal transmission of voice audio.
 	/// </summary>
-	Microphone = 1<<0,
+	Microphone = 1 << 0,
 
 	/// <summary>
 	/// Transmission of context audio for video, no speaking indicator.
 	/// </summary>
-	Soundshare = 1<<1,
+	Soundshare = 1 << 1,
 
 	/// <summary>
 	/// Priority speaker, lowering audio of other speakers.
 	/// </summary>
-	Priority = 1<<2
+	Priority = 1 << 2
 }
diff --git a/DisCatSharp/Enums/Webhook/WebhookType.cs b/DisCatSharp/Enums/Webhook/WebhookType.cs
new file mode 100644
index 0000000000..c81392b172
--- /dev/null
+++ b/DisCatSharp/Enums/Webhook/WebhookType.cs
@@ -0,0 +1,22 @@
+namespace DisCatSharp.Enums;
+
+/// <summary>
+/// Represents the type of a webhook.
+/// </summary>
+public enum WebhookType : int
+{
+	/// <summary>
+	/// Incoming webhooks can post messages to channels with a generated token.
+	/// </summary>
+	Incoming = 1,
+
+	/// <summary>
+	/// Channel follower webhooks are internal webhooks used with channel following to post new messages into channels.
+	/// </summary>
+	ChannelFollower = 2,
+
+	/// <summary>
+	/// Application webhooks are webhooks used with interactions.
+	/// </summary>
+	Application = 3
+}
diff --git a/DisCatSharp/EventArgs/Guild/Member/GuildMemberUpdateEventArgs.cs b/DisCatSharp/EventArgs/Guild/Member/GuildMemberUpdateEventArgs.cs
index 4c3c21bafb..9a0b7b4cef 100644
--- a/DisCatSharp/EventArgs/Guild/Member/GuildMemberUpdateEventArgs.cs
+++ b/DisCatSharp/EventArgs/Guild/Member/GuildMemberUpdateEventArgs.cs
@@ -86,13 +86,12 @@ public string GuildAvatarUrlAfter
 	public virtual string AvatarHashBefore { get; internal set; }
 
 	public string AvatarUrlBefore
-		=> string.IsNullOrWhiteSpace(this.AvatarHashBefore) ? null : $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.GUILDS}/{this.Guild.Id.ToString(CultureInfo.InvariantCulture)}{Endpoints.USERS}/{this.Member.Id.ToString(CultureInfo.InvariantCulture)}{Endpoints.AVATARS}/{this.AvatarHashBefore}.{(this.AvatarHashBefore.StartsWith("a_") ? "gif" : "png")}?size=1024";
+		=> string.IsNullOrWhiteSpace(this.AvatarHashBefore) ? null : $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.AVATARS}/{this.Member.Id.ToString(CultureInfo.InvariantCulture)}/{this.AvatarHashBefore}.{(this.AvatarHashBefore.StartsWith("a_") ? "gif" : "png")}?size=1024";
 
 	public virtual string AvatarHashAfter { get; internal set; }
 
 	public string AvatarUrlAfter
-		=> string.IsNullOrWhiteSpace(this.AvatarHashAfter) ? null : $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.GUILDS}/{this.Guild.Id.ToString(CultureInfo.InvariantCulture)}{Endpoints.USERS}/{this.Member.Id.ToString(CultureInfo.InvariantCulture)}{Endpoints.AVATARS}/{this.AvatarHashAfter}.{(this.AvatarHashAfter.StartsWith("a_") ? "gif" : "png")}?size=1024";
-
+		=> string.IsNullOrWhiteSpace(this.AvatarHashAfter) ? null : $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.AVATARS}/{this.Member.Id.ToString(CultureInfo.InvariantCulture)}/{this.AvatarHashAfter}.{(this.AvatarHashAfter.StartsWith("a_") ? "gif" : "png")}?size=1024";
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="GuildMemberUpdateEventArgs"/> class.
diff --git a/DisCatSharp/EventArgs/Guild/Thread/ThreadMembersUpdateEventArgs.cs b/DisCatSharp/EventArgs/Guild/Thread/ThreadMembersUpdateEventArgs.cs
index a784d64863..cadc20d091 100644
--- a/DisCatSharp/EventArgs/Guild/Thread/ThreadMembersUpdateEventArgs.cs
+++ b/DisCatSharp/EventArgs/Guild/Thread/ThreadMembersUpdateEventArgs.cs
@@ -20,7 +20,6 @@ public class ThreadMembersUpdateEventArgs : DiscordEventArgs
 	/// </summary>
 	public IReadOnlyList<DiscordMember> RemovedMembers { get; internal set; }
 
-
 	/// <summary>
 	/// Gets the users who were added to the thread.
 	/// </summary>
diff --git a/DisCatSharp/EventArgs/PayloadReceivedEventArgs.cs b/DisCatSharp/EventArgs/PayloadReceivedEventArgs.cs
index 8b965a0998..28918c1d7d 100644
--- a/DisCatSharp/EventArgs/PayloadReceivedEventArgs.cs
+++ b/DisCatSharp/EventArgs/PayloadReceivedEventArgs.cs
@@ -23,6 +23,7 @@ public string Json
 	}
 
 	private string _json;
+
 	/// <summary>
 	/// Gets or sets the payload object.
 	/// </summary>
diff --git a/DisCatSharp/Formatter.cs b/DisCatSharp/Formatter.cs
index b9b64f0050..07b220011d 100644
--- a/DisCatSharp/Formatter.cs
+++ b/DisCatSharp/Formatter.cs
@@ -17,6 +17,7 @@ public static class Formatter
 	/// Gets the md sanitize regex.
 	/// </summary>
 	private static Regex s_mdSanitizeRegex { get; } = new(@"([`\*_~<>\[\]\(\)""@\!\&#:\|])", RegexOptions.ECMAScript);
+
 	/// <summary>
 	/// Gets the md strip regex.
 	/// </summary>
@@ -197,8 +198,8 @@ public static string Strip(this string text)
 	/// <returns>Formatted mention.</returns>
 	public static string Mention(this DiscordUser user, bool nickname = false)
 		=> nickname
-		? $"<@!{user.Id.ToString(CultureInfo.InvariantCulture)}>"
-		: $"<@{user.Id.ToString(CultureInfo.InvariantCulture)}>";
+			? $"<@!{user.Id.ToString(CultureInfo.InvariantCulture)}>"
+			: $"<@{user.Id.ToString(CultureInfo.InvariantCulture)}>";
 
 	/// <summary>
 	/// Creates a mention for specified channel.
diff --git a/DisCatSharp/GlobalSuppressions.cs b/DisCatSharp/GlobalSuppressions.cs
index aa23ef6025..ff710c3729 100644
--- a/DisCatSharp/GlobalSuppressions.cs
+++ b/DisCatSharp/GlobalSuppressions.cs
@@ -82,3 +82,4 @@
 [assembly: SuppressMessage("Usage", "DCS0200:[Discord] Requires Features", Justification = "<Pending>", Scope = "member", Target = "~P:DisCatSharp.Entities.DiscordGuild.PublicUpdatesChannel")]
 [assembly: SuppressMessage("Usage", "DCS0200:[Discord] Requires Features", Justification = "<Pending>", Scope = "member", Target = "~P:DisCatSharp.Entities.DiscordGuild.RulesChannel")]
 [assembly: SuppressMessage("Usage", "DCS0200:[Discord] Requires Features", Justification = "<Pending>", Scope = "member", Target = "~P:DisCatSharp.Entities.DiscordGuild.SafetyAltersChannel")]
+[assembly: SuppressMessage("Style", "IDE0048:Add parentheses for clarity", Justification = "<Pending>", Scope = "member", Target = "~M:DisCatSharp.Entities.DiscordRole.op_Equality(DisCatSharp.Entities.DiscordRole,DisCatSharp.Entities.DiscordRole)~System.Boolean")]
diff --git a/DisCatSharp/ImageTool.cs b/DisCatSharp/ImageTool.cs
index 093b243b62..f29175d344 100644
--- a/DisCatSharp/ImageTool.cs
+++ b/DisCatSharp/ImageTool.cs
@@ -15,26 +15,32 @@ public sealed class ImageTool : IDisposable
 	/// The png magic .
 	/// </summary>
 	private const ulong PNG_MAGIC = 0x0A1A_0A0D_474E_5089;
+
 	/// <summary>
 	/// The jpeg magic 1.
 	/// </summary>
 	private const ushort JPEG_MAGIC_1 = 0xD8FF;
+
 	/// <summary>
 	/// The jpeg magic 2.
 	/// </summary>
 	private const ushort JPEG_MAGIC_2 = 0xD9FF;
+
 	/// <summary>
 	/// The gif magic 1
 	/// </summary>
 	private const ulong GIF_MAGIC_1 = 0x0000_6139_3846_4947;
+
 	/// <summary>
 	/// The gif magic 2.
 	/// </summary>
 	private const ulong GIF_MAGIC_2 = 0x0000_6137_3846_4947;
+
 	/// <summary>
 	/// The webp magic 1.
 	/// </summary>
 	private const uint WEBP_MAGIC_1 = 0x4646_4952;
+
 	/// <summary>
 	/// The webp magic 2.
 	/// </summary>
@@ -44,10 +50,12 @@ public sealed class ImageTool : IDisposable
 	/// The gif mask.
 	/// </summary>
 	private const ulong GIF_MASK = 0x0000_FFFF_FFFF_FFFF;
+
 	/// <summary>
 	/// The mask 32.
 	/// </summary>
 	private const ulong MASK32 = 0x0000_0000_FFFF_FFFF;
+
 	/// <summary>
 	/// The mask 16.
 	/// </summary>
diff --git a/DisCatSharp/Logging/DefaultLogger.cs b/DisCatSharp/Logging/DefaultLogger.cs
index 394780c120..04c57f593d 100644
--- a/DisCatSharp/Logging/DefaultLogger.cs
+++ b/DisCatSharp/Logging/DefaultLogger.cs
@@ -86,6 +86,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
 					Console.ForegroundColor = ConsoleColor.Black;
 					break;
 			}
+
 			Console.Write(logLevel switch
 			{
 				LogLevel.Trace => "[Trace] ",
diff --git a/DisCatSharp/Logging/DefaultLoggerFactory.cs b/DisCatSharp/Logging/DefaultLoggerFactory.cs
index 9d0597ce1b..32a6b53158 100644
--- a/DisCatSharp/Logging/DefaultLoggerFactory.cs
+++ b/DisCatSharp/Logging/DefaultLoggerFactory.cs
@@ -14,6 +14,7 @@ internal class DefaultLoggerFactory : ILoggerFactory
 	/// Gets the providers.
 	/// </summary>
 	private readonly List<ILoggerProvider> _providers = new();
+
 	private bool _isDisposed;
 
 	/// <summary>
@@ -40,6 +41,7 @@ public void Dispose()
 	{
 		if (this._isDisposed)
 			return;
+
 		this._isDisposed = true;
 
 		foreach (var provider in this._providers)
diff --git a/DisCatSharp/Net/Abstractions/AuditLogAbstractions.cs b/DisCatSharp/Net/Abstractions/AuditLogAbstractions.cs
index 41070d3c4d..eb98eca75b 100644
--- a/DisCatSharp/Net/Abstractions/AuditLogAbstractions.cs
+++ b/DisCatSharp/Net/Abstractions/AuditLogAbstractions.cs
@@ -547,6 +547,9 @@ internal sealed class AuditLog : ObservableApiObject
         public IReadOnlyList<AuditLogApplicationCommand> ApplicationCommands { get; set; }
         */
 	internal AuditLog()
-		: base(new() { "application_commands", "auto_moderation_rules" })
+		: base(new()
+		{
+			"application_commands", "auto_moderation_rules"
+		})
 	{ }
 }
diff --git a/DisCatSharp/Net/Abstractions/ClientProperties.cs b/DisCatSharp/Net/Abstractions/ClientProperties.cs
index 00d5bce53c..25bed502f0 100644
--- a/DisCatSharp/Net/Abstractions/ClientProperties.cs
+++ b/DisCatSharp/Net/Abstractions/ClientProperties.cs
@@ -40,7 +40,12 @@ public string OperatingSystem
 				return "miros bsd";
 			else if (plat.Contains("desktopbsd"))
 				return "desktopbsd";
-			else return plat.Contains("darwin") ? "osx" : plat.Contains("unix") ? "unix" : "toaster (unknown)";
+			else
+				return plat.Contains("darwin")
+					? "osx"
+					: plat.Contains("unix")
+						? "unix"
+						: "toaster (unknown)";
 		}
 	}
 
diff --git a/DisCatSharp/Net/Abstractions/Gateway/GatewayIdentifyResume.cs b/DisCatSharp/Net/Abstractions/Gateway/GatewayIdentifyResume.cs
index 5e546a3a90..b9e3f7ca35 100644
--- a/DisCatSharp/Net/Abstractions/Gateway/GatewayIdentifyResume.cs
+++ b/DisCatSharp/Net/Abstractions/Gateway/GatewayIdentifyResume.cs
@@ -26,7 +26,10 @@ internal sealed class GatewayIdentify
 	/// </summary>
 	[JsonProperty("properties")]
 	public ClientProperties ClientProperties =>
-		new() { Discord = this.Discord };
+		new()
+		{
+			Discord = this.Discord
+		};
 
 	/// <summary>
 	/// Gets or sets whether to encrypt websocket traffic.
diff --git a/DisCatSharp/Net/Abstractions/Gateway/GatewayOpCode.cs b/DisCatSharp/Net/Abstractions/Gateway/GatewayOpCode.cs
index 6aa29d4649..49255e91c2 100644
--- a/DisCatSharp/Net/Abstractions/Gateway/GatewayOpCode.cs
+++ b/DisCatSharp/Net/Abstractions/Gateway/GatewayOpCode.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Net.Abstractions;
 
 /// <summary>
diff --git a/DisCatSharp/Net/Abstractions/IOAuth2Payload.cs b/DisCatSharp/Net/Abstractions/IOAuth2Payload.cs
index d9832b5776..0b33f7c586 100644
--- a/DisCatSharp/Net/Abstractions/IOAuth2Payload.cs
+++ b/DisCatSharp/Net/Abstractions/IOAuth2Payload.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Net.Abstractions;
 
 /// <summary>
diff --git a/DisCatSharp/Net/Abstractions/Rest/RestApplicationCommandPayloads.cs b/DisCatSharp/Net/Abstractions/Rest/RestApplicationCommandPayloads.cs
index 686ae06ec1..932651bef3 100644
--- a/DisCatSharp/Net/Abstractions/Rest/RestApplicationCommandPayloads.cs
+++ b/DisCatSharp/Net/Abstractions/Rest/RestApplicationCommandPayloads.cs
@@ -83,7 +83,6 @@ internal sealed class RestApplicationCommandCreatePayload : ObservableApiObject
 	/// </summary>
 	[JsonProperty("integration_types", NullValueHandling = NullValueHandling.Ignore)]
 	public List<ApplicationCommandIntegrationTypes>? IntegrationTypes { get; set; }
-
 }
 
 /// <summary>
diff --git a/DisCatSharp/Net/Abstractions/Rest/RestChannelPayloads.cs b/DisCatSharp/Net/Abstractions/Rest/RestChannelPayloads.cs
index d3fc8769bb..3cab60bbd0 100644
--- a/DisCatSharp/Net/Abstractions/Rest/RestChannelPayloads.cs
+++ b/DisCatSharp/Net/Abstractions/Rest/RestChannelPayloads.cs
@@ -311,7 +311,6 @@ internal sealed class RestChannelMessageCreatePayload : RestChannelMessageEditPa
 	/// </summary>
 	[JsonProperty("message_reference", NullValueHandling = NullValueHandling.Ignore)]
 	public InternalDiscordMessageReference? MessageReference { get; set; }
-
 }
 
 /// <summary>
diff --git a/DisCatSharp/Net/Abstractions/Rest/RestGcpAttachmentsPayload.cs b/DisCatSharp/Net/Abstractions/Rest/RestGcpAttachmentsPayload.cs
index 3b21ef810e..212a2c2e73 100644
--- a/DisCatSharp/Net/Abstractions/Rest/RestGcpAttachmentsPayload.cs
+++ b/DisCatSharp/Net/Abstractions/Rest/RestGcpAttachmentsPayload.cs
@@ -1,4 +1,3 @@
-
 using System.Collections.Generic;
 
 using DisCatSharp.Entities;
diff --git a/DisCatSharp/Net/Abstractions/Rest/RestGuildPayloads.cs b/DisCatSharp/Net/Abstractions/Rest/RestGuildPayloads.cs
index cfb8a288d1..5ed0f55116 100644
--- a/DisCatSharp/Net/Abstractions/Rest/RestGuildPayloads.cs
+++ b/DisCatSharp/Net/Abstractions/Rest/RestGuildPayloads.cs
@@ -144,7 +144,6 @@ internal sealed class RestGuildModifyPayload : ObservableApiObject
 	[JsonProperty("home_header")]
 	public Optional<string> HomeHeaderBase64 { get; set; }
 
-
 	/// <summary>
 	/// Gets or sets the discovery splash base64.
 	/// </summary>
diff --git a/DisCatSharp/Net/Abstractions/ShardInfo.cs b/DisCatSharp/Net/Abstractions/ShardInfo.cs
index 8aa3b698ac..30c3e6e7c8 100644
--- a/DisCatSharp/Net/Abstractions/ShardInfo.cs
+++ b/DisCatSharp/Net/Abstractions/ShardInfo.cs
@@ -36,7 +36,10 @@ internal sealed class ShardInfoConverter : JsonConverter
 	public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 	{
 		var sinfo = value as ShardInfo;
-		var obj = new object[] { sinfo.ShardId, sinfo.ShardCount };
+		var obj = new object[]
+		{
+			sinfo.ShardId, sinfo.ShardCount
+		};
 		serializer.Serialize(writer, obj);
 	}
 
@@ -52,8 +55,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		var arr = this.ReadArrayObject(reader, serializer);
 		return new ShardInfo
 		{
-			ShardId = (int)arr[0],
-			ShardCount = (int)arr[1],
+			ShardId = (int)arr[0], ShardCount = (int)arr[1]
 		};
 	}
 
diff --git a/DisCatSharp/Net/Abstractions/StatusUpdate.cs b/DisCatSharp/Net/Abstractions/StatusUpdate.cs
index 0266a0728e..1e8cc70648 100644
--- a/DisCatSharp/Net/Abstractions/StatusUpdate.cs
+++ b/DisCatSharp/Net/Abstractions/StatusUpdate.cs
@@ -39,7 +39,7 @@ internal sealed class StatusUpdate : ObservableApiObject
 			UserStatus.DoNotDisturb => "dnd",
 			UserStatus.Invisible or UserStatus.Offline => "invisible",
 			UserStatus.Streaming => "streaming",
-			_ => "online",
+			_ => "online"
 		};
 
 	/// <summary>
diff --git a/DisCatSharp/Net/Abstractions/Transport/TransportActivity.cs b/DisCatSharp/Net/Abstractions/Transport/TransportActivity.cs
index 4225718fd4..96b4fe0f06 100644
--- a/DisCatSharp/Net/Abstractions/Transport/TransportActivity.cs
+++ b/DisCatSharp/Net/Abstractions/Transport/TransportActivity.cs
@@ -314,7 +314,10 @@ internal sealed class GamePartySizeConverter : JsonConverter
 	public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 	{
 		var obj = value is TransportActivity.GameParty.GamePartySize sinfo
-			? new object[] { sinfo.Current, sinfo.Maximum }
+			? new object[]
+			{
+				sinfo.Current, sinfo.Maximum
+			}
 			: null;
 		serializer.Serialize(writer, obj);
 	}
@@ -331,8 +334,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		var arr = this.ReadArrayObject(reader, serializer);
 		return new TransportActivity.GameParty.GamePartySize
 		{
-			Current = (long)arr[0],
-			Maximum = (long)arr[1],
+			Current = (long)arr[0], Maximum = (long)arr[1]
 		};
 	}
 
diff --git a/DisCatSharp/Net/ConnectionEndpoint.cs b/DisCatSharp/Net/ConnectionEndpoint.cs
index 9826315333..5723d6f8db 100644
--- a/DisCatSharp/Net/ConnectionEndpoint.cs
+++ b/DisCatSharp/Net/ConnectionEndpoint.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Net;
 
 /// <summary>
@@ -38,7 +37,7 @@ public ConnectionEndpoint(string hostname, int port, bool secured = false)
 	/// Gets the hash code of this endpoint.
 	/// </summary>
 	/// <returns>Hash code of this endpoint.</returns>
-	public override readonly int GetHashCode() => 13 + (7 * this.Hostname.GetHashCode()) + (7 * this.Port);
+	public override readonly int GetHashCode() => 13 + 7 * this.Hostname.GetHashCode() + 7 * this.Port;
 
 	/// <summary>
 	/// Gets the string representation of this connection endpoint.
diff --git a/DisCatSharp/Net/Models/ApplicationCommandEditModel.cs b/DisCatSharp/Net/Models/ApplicationCommandEditModel.cs
index d1ef3d83a0..49b93b54aa 100644
--- a/DisCatSharp/Net/Models/ApplicationCommandEditModel.cs
+++ b/DisCatSharp/Net/Models/ApplicationCommandEditModel.cs
@@ -21,9 +21,11 @@ public Optional<string> Name
 		{
 			if (value.Value.Length > 32)
 				throw new ArgumentException("Application command name cannot exceed 32 characters.", nameof(value));
+
 			this._name = value;
 		}
 	}
+
 	private Optional<string> _name;
 
 	/// <summary>
@@ -36,9 +38,11 @@ public Optional<string> Description
 		{
 			if (value.Value.Length > 100)
 				throw new ArgumentException("Application command description cannot exceed 100 characters.", nameof(value));
+
 			this._description = value;
 		}
 	}
+
 	private Optional<string> _description;
 
 	/// <summary>
diff --git a/DisCatSharp/Net/Models/BaseEditModel.cs b/DisCatSharp/Net/Models/BaseEditModel.cs
index f388d59e95..fe34be4d46 100644
--- a/DisCatSharp/Net/Models/BaseEditModel.cs
+++ b/DisCatSharp/Net/Models/BaseEditModel.cs
@@ -1,4 +1,3 @@
-
 namespace DisCatSharp.Net.Models;
 
 /// <summary>
diff --git a/DisCatSharp/Net/Rest/BaseRestRequest.cs b/DisCatSharp/Net/Rest/BaseRestRequest.cs
index 9356f83c61..3558c23564 100644
--- a/DisCatSharp/Net/Rest/BaseRestRequest.cs
+++ b/DisCatSharp/Net/Rest/BaseRestRequest.cs
@@ -138,5 +138,4 @@ protected internal void SetFaulted(Exception ex)
 	/// <param name="ex">The exception to set.</param>
 	protected internal bool TrySetFaulted(Exception ex)
 		=> this.RequestTaskSource.TrySetException(ex);
-
 }
diff --git a/DisCatSharp/Net/Rest/DiscordApiClient.cs b/DisCatSharp/Net/Rest/DiscordApiClient.cs
index 6a4641d345..8f666649c3 100644
--- a/DisCatSharp/Net/Rest/DiscordApiClient.cs
+++ b/DisCatSharp/Net/Rest/DiscordApiClient.cs
@@ -131,15 +131,11 @@ private DiscordMessage PrepareMessage(JToken msgRaw)
 		var channel = !ret.GuildId.HasValue
 			? new DiscordDmChannel
 			{
-				Id = ret.ChannelId,
-				Discord = this.Discord,
-				Type = ChannelType.Private
+				Id = ret.ChannelId, Discord = this.Discord, Type = ChannelType.Private
 			}
 			: new DiscordChannel
 			{
-				Id = ret.ChannelId,
-				GuildId = ret.GuildId,
-				Discord = this.Discord
+				Id = ret.ChannelId, GuildId = ret.GuildId, Discord = this.Discord
 			};
 
 		ret.Channel = channel;
@@ -158,26 +154,29 @@ private void PopulateMessage(TransportUser author, DiscordMessage ret)
 
 		//If this is a webhook, it shouldn't be in the user cache.
 		if (author.IsBot && int.Parse(author.Discriminator) == 0)
-		{
-			ret.Author = new(author) { Discord = this.Discord };
-		}
+			ret.Author = new(author)
+			{
+				Discord = this.Discord
+			};
 		else
 		{
 			if (!this.Discord.UserCache.TryGetValue(author.Id, out var usr))
-			{
-				this.Discord.UserCache[author.Id] = usr = new(author) { Discord = this.Discord };
-			}
+				this.Discord.UserCache[author.Id] = usr = new(author)
+				{
+					Discord = this.Discord
+				};
 
 			if (guild != null)
 			{
 				if (!guild.Members.TryGetValue(author.Id, out var mbr))
-					mbr = new(usr) { Discord = this.Discord, GuildId = guild.Id };
+					mbr = new(usr)
+					{
+						Discord = this.Discord, GuildId = guild.Id
+					};
 				ret.Author = mbr;
 			}
 			else
-			{
 				ret.Author = usr;
-			}
 		}
 
 		ret.PopulateMentions();
@@ -244,8 +243,19 @@ internal Task<RestResponse> DoFormRequestAsync(DiscordOAuth2Client client, RateL
 	/// <param name="tags">The sticker tag.</param>
 	/// <param name="description">The sticker description.</param>
 	/// <param name="ratelimitWaitOverride">The ratelimit wait override.</param>
-	private Task<RestResponse> DoStickerMultipartAsync(BaseDiscordClient client, RateLimitBucket bucket, Uri url, RestRequestMethod method, string route, IReadOnlyDictionary<string, string> headers = null,
-		DiscordMessageFile file = null, string name = "", string tags = "", string description = "", double? ratelimitWaitOverride = null)
+	private Task<RestResponse> DoStickerMultipartAsync(
+		BaseDiscordClient client,
+		RateLimitBucket bucket,
+		Uri url,
+		RestRequestMethod method,
+		string route,
+		IReadOnlyDictionary<string, string> headers = null,
+		DiscordMessageFile file = null,
+		string name = "",
+		string tags = "",
+		string description = "",
+		double? ratelimitWaitOverride = null
+	)
 	{
 		var req = new MultipartStickerWebRequest(client, bucket, url, method, route, headers, file, name, tags, description, ratelimitWaitOverride);
 
@@ -269,8 +279,17 @@ private Task<RestResponse> DoStickerMultipartAsync(BaseDiscordClient client, Rat
 	/// <param name="values">The values.</param>
 	/// <param name="files">The files.</param>
 	/// <param name="ratelimitWaitOverride">The ratelimit wait override.</param>
-	private Task<RestResponse> DoMultipartAsync(BaseDiscordClient client, RateLimitBucket bucket, Uri url, RestRequestMethod method, string route, IReadOnlyDictionary<string, string> headers = null, IReadOnlyDictionary<string, string> values = null,
-		IReadOnlyCollection<DiscordMessageFile> files = null, double? ratelimitWaitOverride = null)
+	private Task<RestResponse> DoMultipartAsync(
+		BaseDiscordClient client,
+		RateLimitBucket bucket,
+		Uri url,
+		RestRequestMethod method,
+		string route,
+		IReadOnlyDictionary<string, string> headers = null,
+		IReadOnlyDictionary<string, string> values = null,
+		IReadOnlyCollection<DiscordMessageFile> files = null,
+		double? ratelimitWaitOverride = null
+	)
 	{
 		var req = new MultipartWebRequest(client, bucket, url, method, route, headers, values, files, ratelimitWaitOverride);
 
@@ -284,7 +303,7 @@ private Task<RestResponse> DoMultipartAsync(BaseDiscordClient client, RateLimitB
 
 	// begin todo
 
-	#region Guild
+#region Guild
 
 	/// <summary>
 	/// Gets the guild async.
@@ -298,7 +317,10 @@ internal async Task<DiscordGuild> GetGuildAsync(ulong guildId, bool? withCounts)
 			urlParams["with_counts"] = withCounts?.ToString();
 
 		var route = $"{Endpoints.GUILDS}/:guild_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route, urlParams).ConfigureAwait(false);
@@ -330,11 +352,13 @@ internal async Task<DiscordGuild> GetGuildAsync(ulong guildId, bool? withCounts)
 	internal async Task<IReadOnlyList<DiscordMember>> SearchMembersAsync(ulong guildId, string name, int? limit)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}{Endpoints.SEARCH}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 		var querydict = new Dictionary<string, string>
 		{
-			["query"] = name,
-			["limit"] = limit.ToString()
+			["query"] = name, ["limit"] = limit.ToString()
 		};
 		var url = Utilities.GetApiUriFor(path, BuildQueryString(querydict), this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -344,7 +368,10 @@ internal async Task<IReadOnlyList<DiscordMember>> SearchMembersAsync(ulong guild
 		var mbrs = new List<DiscordMember>();
 		foreach (var xtm in tms)
 		{
-			var usr = new DiscordUser(xtm.User) { Discord = this.Discord };
+			var usr = new DiscordUser(xtm.User)
+			{
+				Discord = this.Discord
+			};
 
 			this.Discord.UserCache.AddOrUpdate(xtm.User.Id, usr, (id, old) =>
 			{
@@ -361,7 +388,10 @@ internal async Task<IReadOnlyList<DiscordMember>> SearchMembersAsync(ulong guild
 				return old;
 			});
 
-			mbrs.Add(new(xtm) { Discord = this.Discord, GuildId = guildId });
+			mbrs.Add(new(xtm)
+			{
+				Discord = this.Discord, GuildId = guildId
+			});
 		}
 
 		return mbrs;
@@ -375,7 +405,10 @@ internal async Task<IReadOnlyList<DiscordMember>> SearchMembersAsync(ulong guild
 	internal async Task<DiscordBan> GetGuildBanAsync(ulong guildId, ulong userId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.BANS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, user_id = userId}, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId, user_id = userId
+		}, out var path);
 		var uri = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, uri, RestRequestMethod.GET, route).ConfigureAwait(false);
 		var json = JObject.Parse(res.Response);
@@ -394,8 +427,14 @@ internal async Task<DiscordBan> GetGuildBanAsync(ulong guildId, ulong userId)
 	/// <param name="verificationLevel">The verification_level.</param>
 	/// <param name="defaultMessageNotifications">The default_message_notifications.</param>
 	/// <param name="systemChannelFlags">The system_channel_flags.</param>
-	internal async Task<DiscordGuild> CreateGuildAsync(string name, string regionId, Optional<string> iconb64, VerificationLevel? verificationLevel,
-		DefaultMessageNotifications? defaultMessageNotifications, SystemChannelFlags? systemChannelFlags)
+	internal async Task<DiscordGuild> CreateGuildAsync(
+		string name,
+		string regionId,
+		Optional<string> iconb64,
+		VerificationLevel? verificationLevel,
+		DefaultMessageNotifications? defaultMessageNotifications,
+		SystemChannelFlags? systemChannelFlags
+	)
 	{
 		var pld = new RestGuildCreatePayload
 		{
@@ -408,7 +447,8 @@ internal async Task<DiscordGuild> CreateGuildAsync(string name, string regionId,
 		};
 
 		var route = $"{Endpoints.GUILDS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -432,12 +472,14 @@ internal async Task<DiscordGuild> CreateGuildFromTemplateAsync(string templateCo
 	{
 		var pld = new RestGuildCreateFromTemplatePayload
 		{
-			Name = name,
-			IconBase64 = iconb64
+			Name = name, IconBase64 = iconb64
 		};
 
 		var route = $"{Endpoints.GUILDS}{Endpoints.TEMPLATES}/:template_code";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {template_code = templateCode }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			template_code = templateCode
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -458,7 +500,10 @@ internal async Task<DiscordGuild> CreateGuildFromTemplateAsync(string templateCo
 	internal async Task DeleteGuildAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route).ConfigureAwait(false);
@@ -495,13 +540,30 @@ internal async Task DeleteGuildAsync(ulong guildId)
 	/// <param name="preferredLocale">The preferred locale.</param>
 	/// <param name="premiumProgressBarEnabled">Whether the premium progress bar should be enabled.</param>
 	/// <param name="reason">The reason.</param>
-	internal async Task<DiscordGuild> ModifyGuildAsync(ulong guildId, Optional<string> name, Optional<VerificationLevel> verificationLevel,
-		Optional<DefaultMessageNotifications> defaultMessageNotifications, Optional<MfaLevel> mfaLevel,
-		Optional<ExplicitContentFilter> explicitContentFilter, Optional<ulong?> afkChannelId,
-		Optional<int> afkTimeout, Optional<string> iconb64, Optional<ulong> ownerId, Optional<string> splashb64,
-		Optional<ulong?> systemChannelId, Optional<SystemChannelFlags> systemChannelFlags,
-		Optional<ulong?> publicUpdatesChannelId, Optional<ulong?> rulesChannelId, Optional<string> description,
-		Optional<string> bannerb64, Optional<string> discoverySplashb64, Optional<string> homeHeaderb64, Optional<string> preferredLocale, Optional<bool> premiumProgressBarEnabled, string? reason)
+	internal async Task<DiscordGuild> ModifyGuildAsync(
+		ulong guildId,
+		Optional<string> name,
+		Optional<VerificationLevel> verificationLevel,
+		Optional<DefaultMessageNotifications> defaultMessageNotifications,
+		Optional<MfaLevel> mfaLevel,
+		Optional<ExplicitContentFilter> explicitContentFilter,
+		Optional<ulong?> afkChannelId,
+		Optional<int> afkTimeout,
+		Optional<string> iconb64,
+		Optional<ulong> ownerId,
+		Optional<string> splashb64,
+		Optional<ulong?> systemChannelId,
+		Optional<SystemChannelFlags> systemChannelFlags,
+		Optional<ulong?> publicUpdatesChannelId,
+		Optional<ulong?> rulesChannelId,
+		Optional<string> description,
+		Optional<string> bannerb64,
+		Optional<string> discoverySplashb64,
+		Optional<string> homeHeaderb64,
+		Optional<string> preferredLocale,
+		Optional<bool> premiumProgressBarEnabled,
+		string? reason
+	)
 	{
 		var pld = new RestGuildModifyPayload
 		{
@@ -532,7 +594,10 @@ internal async Task<DiscordGuild> ModifyGuildAsync(ulong guildId, Optional<strin
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -548,8 +613,6 @@ internal async Task<DiscordGuild> ModifyGuildAsync(ulong guildId, Optional<strin
 		return guild;
 	}
 
-
-
 	/// <summary>
 	/// Modifies the guild community settings.
 	/// </summary>
@@ -582,7 +645,10 @@ internal async Task<DiscordGuild> ModifyGuildCommunitySettingsAsync(ulong guildI
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -616,12 +682,18 @@ internal async Task<DiscordGuild> ModifyGuildInventorySettingsAsync(ulong guildI
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INVENTORY}{Endpoints.SETTINGS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
-		this.Discord.Guilds[guildId].InventorySettings = new() { IsEmojiPackCollectible = isEmojiPackCollectible };
+		this.Discord.Guilds[guildId].InventorySettings = new()
+		{
+			IsEmojiPackCollectible = isEmojiPackCollectible
+		};
 		return this.Discord.Guilds[guildId];
 	}
 
@@ -635,12 +707,14 @@ internal async Task<IncidentsData> ModifyGuildIncidentActionsAsync(ulong guildId
 	{
 		var pld = new RestGuildIncidentActionsModifyPayload
 		{
-			InvitesDisabledUntil = invitesDisabledUntil,
-			DmsDisabledUntil = dmsDisabledUntil,
+			InvitesDisabledUntil = invitesDisabledUntil, DmsDisabledUntil = dmsDisabledUntil
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INCIDENT_ACTIONS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -658,7 +732,10 @@ internal async Task<IncidentsData> ModifyGuildIncidentActionsAsync(ulong guildId
 	internal async Task<DiscordOnboarding> GetGuildOnboardingAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ONBOARDING}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -681,10 +758,7 @@ internal async Task<DiscordOnboarding> ModifyGuildOnboardingAsync(ulong guildId,
 	{
 		var pld = new RestGuildOnboardingModifyPayload()
 		{
-			Prompts = prompts,
-			DefaultChannelIds = defaultChannelIds,
-			Enabled = enabled,
-			Mode = mode
+			Prompts = prompts, DefaultChannelIds = defaultChannelIds, Enabled = enabled, Mode = mode
 		};
 
 		var headers = Utilities.GetBaseHeaders();
@@ -692,7 +766,10 @@ internal async Task<DiscordOnboarding> ModifyGuildOnboardingAsync(ulong guildId,
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ONBOARDING}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -709,7 +786,10 @@ internal async Task<DiscordOnboarding> ModifyGuildOnboardingAsync(ulong guildId,
 	internal async Task<DiscordServerGuide> GetGuildServerGuideAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.NEW_MEMBER_WELCOME}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -732,10 +812,7 @@ internal async Task<DiscordServerGuide> ModifyGuildServerGuideAsync(ulong guildI
 	{
 		var pld = new RestGuildServerGuideModifyPayload()
 		{
-			Enabled = enabled,
-			WelcomeMessage = welcomeMessage,
-			NewMemberActions = newMemberActions,
-			ResourceChannels = resourceChannels
+			Enabled = enabled, WelcomeMessage = welcomeMessage, NewMemberActions = newMemberActions, ResourceChannels = resourceChannels
 		};
 
 		var headers = Utilities.GetBaseHeaders();
@@ -743,7 +820,10 @@ internal async Task<DiscordServerGuide> ModifyGuildServerGuideAsync(ulong guildI
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.NEW_MEMBER_WELCOME}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -764,8 +844,7 @@ internal async Task<DiscordGuild> ModifyGuildSafetyAlertsSettingsAsync(ulong gui
 	{
 		var pld = new RestGuildSafetyModifyPayload
 		{
-			SafetyAlertsChannelId = safetyAlertsChannelId,
-			Features = features
+			SafetyAlertsChannelId = safetyAlertsChannelId, Features = features
 		};
 
 		var headers = Utilities.GetBaseHeaders();
@@ -773,7 +852,10 @@ internal async Task<DiscordGuild> ModifyGuildSafetyAlertsSettingsAsync(ulong gui
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -808,7 +890,10 @@ internal async Task<DiscordGuild> ModifyGuildFeaturesAsync(ulong guildId, List<s
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -841,7 +926,10 @@ internal async Task EnableGuildMfaAsync(ulong guildId, string? reason)
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MFA}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -864,7 +952,10 @@ internal async Task DisableGuildMfaAsync(ulong guildId, string? reason)
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MFA}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -876,7 +967,10 @@ internal async Task DisableGuildMfaAsync(ulong guildId, string? reason)
 	internal async Task<IReadOnlyList<DiscordBan>> GetGuildBansAsync(ulong guildId, int? limit, ulong? before, ulong? after)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.BANS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var urlParams = new Dictionary<string, string>();
 		if (limit != null)
@@ -893,7 +987,10 @@ internal async Task<IReadOnlyList<DiscordBan>> GetGuildBansAsync(ulong guildId,
 		{
 			if (!this.Discord.TryGetCachedUserInternal(xb.RawUser.Id, out var usr))
 			{
-				usr = new(xb.RawUser) { Discord = this.Discord };
+				usr = new(xb.RawUser)
+				{
+					Discord = this.Discord
+				};
 				usr = this.Discord.UserCache.AddOrUpdate(usr.Id, usr, (id, old) =>
 				{
 					old.Username = usr.Username;
@@ -934,7 +1031,10 @@ internal Task CreateGuildBanAsync(ulong guildId, ulong userId, int deleteMessage
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.BANS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new { guild_id = guildId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			guild_id = guildId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, BuildQueryString(urlParams), this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, headers);
@@ -953,7 +1053,10 @@ internal Task RemoveGuildBanAsync(ulong guildId, ulong userId, string? reason)
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.BANS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new { guild_id = guildId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
@@ -966,7 +1069,10 @@ internal Task RemoveGuildBanAsync(ulong guildId, ulong userId, string? reason)
 	internal Task LeaveGuildAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.GUILDS}/:guild_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
@@ -994,7 +1100,10 @@ internal async Task<DiscordMember> AddGuildMemberAsync(ulong guildId, ulong user
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new { guild_id = guildId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			guild_id = guildId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -1020,7 +1129,10 @@ internal async Task<IReadOnlyList<TransportMember>> ListGuildMembersAsync(ulong
 			urlParams["after"] = after.Value.ToString(CultureInfo.InvariantCulture);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -1036,7 +1148,6 @@ internal async Task<IReadOnlyList<TransportMember>> ListGuildMembersAsync(ulong
 	/// <param name="userId">The user_id.</param>
 	/// <param name="roleId">The role_id.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task AddGuildMemberRoleAsync(ulong guildId, ulong userId, ulong roleId, string reason)
 	{
 		var headers = Utilities.GetBaseHeaders();
@@ -1044,7 +1155,10 @@ internal Task AddGuildMemberRoleAsync(ulong guildId, ulong userId, ulong roleId,
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id{Endpoints.ROLES}/:role_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new { guild_id = guildId, user_id = userId, role_id = roleId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			guild_id = guildId, user_id = userId, role_id = roleId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, headers);
@@ -1057,7 +1171,6 @@ internal Task AddGuildMemberRoleAsync(ulong guildId, ulong userId, ulong roleId,
 	/// <param name="userId">The user_id.</param>
 	/// <param name="roleId">The role_id.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task RemoveGuildMemberRoleAsync(ulong guildId, ulong userId, ulong roleId, string reason)
 	{
 		var headers = Utilities.GetBaseHeaders();
@@ -1065,7 +1178,10 @@ internal Task RemoveGuildMemberRoleAsync(ulong guildId, ulong userId, ulong role
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id{Endpoints.ROLES}/:role_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, user_id = userId, role_id = roleId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId, user_id = userId, role_id = roleId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
@@ -1077,7 +1193,6 @@ internal Task RemoveGuildMemberRoleAsync(ulong guildId, ulong userId, ulong role
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="pld">The pld.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task ModifyGuildChannelPositionAsync(ulong guildId, IEnumerable<RestGuildChannelReorderPayload> pld, string reason)
 	{
 		var headers = Utilities.GetBaseHeaders();
@@ -1085,7 +1200,10 @@ internal Task ModifyGuildChannelPositionAsync(ulong guildId, IEnumerable<RestGui
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.CHANNELS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
@@ -1097,7 +1215,6 @@ internal Task ModifyGuildChannelPositionAsync(ulong guildId, IEnumerable<RestGui
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="pld">The pld.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task ModifyGuildChannelParentAsync(ulong guildId, IEnumerable<RestGuildChannelNewParentPayload> pld, string reason)
 	{
 		var headers = Utilities.GetBaseHeaders();
@@ -1105,7 +1222,10 @@ internal Task ModifyGuildChannelParentAsync(ulong guildId, IEnumerable<RestGuild
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.CHANNELS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
@@ -1117,7 +1237,6 @@ internal Task ModifyGuildChannelParentAsync(ulong guildId, IEnumerable<RestGuild
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="pld">The pld.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task DetachGuildChannelParentAsync(ulong guildId, IEnumerable<RestGuildChannelNoParentPayload> pld, string reason)
 	{
 		var headers = Utilities.GetBaseHeaders();
@@ -1125,7 +1244,10 @@ internal Task DetachGuildChannelParentAsync(ulong guildId, IEnumerable<RestGuild
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.CHANNELS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
@@ -1137,7 +1259,6 @@ internal Task DetachGuildChannelParentAsync(ulong guildId, IEnumerable<RestGuild
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="pld">The pld.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task ModifyGuildRolePositionAsync(ulong guildId, IEnumerable<RestGuildRoleReorderPayload> pld, string reason)
 	{
 		var headers = Utilities.GetBaseHeaders();
@@ -1145,7 +1266,10 @@ internal Task ModifyGuildRolePositionAsync(ulong guildId, IEnumerable<RestGuildR
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ROLES}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
@@ -1154,14 +1278,13 @@ internal Task ModifyGuildRolePositionAsync(ulong guildId, IEnumerable<RestGuildR
 	/// <summary>
 	/// Gets the audit logs async.
 	/// </summary>
-	/// <param name="guildId">The guild_id.</param>
+	/// <param name="guildId">The guild id.</param>
 	/// <param name="limit">The limit.</param>
 	/// <param name="after">The after.</param>
 	/// <param name="before">The before.</param>
-	/// <param name="responsible">The responsible.</param>
-	/// <param name="actionType">The action_type.</param>
-
-	internal async Task<AuditLog> GetAuditLogsAsync(ulong guildId, int limit, ulong? after, ulong? before, ulong? responsible, int? actionType)
+	/// <param name="responsible">The responsible user.</param>
+	/// <param name="actionType">The action type.</param>
+	internal async Task<DiscordAuditLog> GetAuditLogsAsync(ulong guildId, int limit, ulong? after, ulong? before, ulong? responsible, int? actionType)
 	{
 		var urlParams = new Dictionary<string, string>
 		{
@@ -1177,25 +1300,41 @@ internal async Task<AuditLog> GetAuditLogsAsync(ulong guildId, int limit, ulong?
 			urlParams["action_type"] = actionType?.ToString(CultureInfo.InvariantCulture);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.AUDIT_LOGS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-		var auditLogDataRaw = DiscordJson.DeserializeObject<AuditLog>(res.Response, this.Discord);
+		var auditLogData = DiscordJson.DeserializeObject<DiscordAuditLog>(res.Response, this.Discord);
+		auditLogData.GuildId = guildId;
+		auditLogData.Entries.ForEach(x =>
+		{
+			x.GuildId = auditLogData.GuildId;
+			x.Discord = (DiscordClient)this.Discord;
+			if (x.Options is null)
+				return;
+
+			x.Options.Discord = this.Discord;
+			x.Options.GuildId = auditLogData.GuildId;
+		});
 
-		return auditLogDataRaw;
+		return auditLogData;
 	}
 
 	/// <summary>
 	/// Gets the guild vanity url async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<DiscordInvite> GetGuildVanityUrlAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.VANITY_URL}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -1209,11 +1348,13 @@ internal async Task<DiscordInvite> GetGuildVanityUrlAsync(ulong guildId)
 	/// Gets the guild widget async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<DiscordWidget> GetGuildWidgetAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WIDGET_JSON}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -1228,9 +1369,7 @@ internal async Task<DiscordWidget> GetGuildWidgetAsync(ulong guildId)
 		ret.Channels = ret.Guild == null
 			? rawChannels.Select(r => new DiscordChannel
 			{
-				Id = (ulong)r["id"],
-				Name = r["name"].ToString(),
-				Position = (int)r["position"]
+				Id = (ulong)r["id"], Name = r["name"].ToString(), Position = (int)r["position"]
 			}).ToList()
 			: rawChannels.Select(r =>
 			{
@@ -1246,11 +1385,13 @@ internal async Task<DiscordWidget> GetGuildWidgetAsync(ulong guildId)
 	/// Gets the guild widget settings async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<DiscordWidgetSettings> GetGuildWidgetSettingsAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WIDGET}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -1268,13 +1409,11 @@ internal async Task<DiscordWidgetSettings> GetGuildWidgetSettingsAsync(ulong gui
 	/// <param name="isEnabled">If true, is enabled.</param>
 	/// <param name="channelId">The channel id.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal async Task<DiscordWidgetSettings> ModifyGuildWidgetSettingsAsync(ulong guildId, bool? isEnabled, ulong? channelId, string reason)
 	{
 		var pld = new RestGuildWidgetSettingsPayload
 		{
-			Enabled = isEnabled,
-			ChannelId = channelId
+			Enabled = isEnabled, ChannelId = channelId
 		};
 
 		var headers = Utilities.GetBaseHeaders();
@@ -1282,7 +1421,10 @@ internal async Task<DiscordWidgetSettings> ModifyGuildWidgetSettingsAsync(ulong
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WIDGET}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -1297,11 +1439,13 @@ internal async Task<DiscordWidgetSettings> ModifyGuildWidgetSettingsAsync(ulong
 	/// Gets the guild templates async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<IReadOnlyList<DiscordGuildTemplate>> GetGuildTemplatesAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.TEMPLATES}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -1317,17 +1461,18 @@ internal async Task<IReadOnlyList<DiscordGuildTemplate>> GetGuildTemplatesAsync(
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="name">The name.</param>
 	/// <param name="description">The description.</param>
-
 	internal async Task<DiscordGuildTemplate> CreateGuildTemplateAsync(ulong guildId, string name, string description)
 	{
 		var pld = new RestGuildTemplateCreateOrModifyPayload
 		{
-			Name = name,
-			Description = description
+			Name = name, Description = description
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.TEMPLATES}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -1342,11 +1487,13 @@ internal async Task<DiscordGuildTemplate> CreateGuildTemplateAsync(ulong guildId
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="templateCode">The template_code.</param>
-
 	internal async Task<DiscordGuildTemplate> SyncGuildTemplateAsync(ulong guildId, string templateCode)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.TEMPLATES}/:template_code";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {guild_id = guildId, template_code = templateCode }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			guild_id = guildId, template_code = templateCode
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route).ConfigureAwait(false);
@@ -1363,17 +1510,18 @@ internal async Task<DiscordGuildTemplate> SyncGuildTemplateAsync(ulong guildId,
 	/// <param name="templateCode">The template_code.</param>
 	/// <param name="name">The name.</param>
 	/// <param name="description">The description.</param>
-
 	internal async Task<DiscordGuildTemplate> ModifyGuildTemplateAsync(ulong guildId, string templateCode, string name, string description)
 	{
 		var pld = new RestGuildTemplateCreateOrModifyPayload
 		{
-			Name = name,
-			Description = description
+			Name = name, Description = description
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.TEMPLATES}/:template_code";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, template_code = templateCode }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId, template_code = templateCode
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -1388,11 +1536,13 @@ internal async Task<DiscordGuildTemplate> ModifyGuildTemplateAsync(ulong guildId
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="templateCode">The template_code.</param>
-
 	internal async Task<DiscordGuildTemplate> DeleteGuildTemplateAsync(ulong guildId, string templateCode)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.TEMPLATES}/:template_code";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, template_code = templateCode }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId, template_code = templateCode
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route).ConfigureAwait(false);
@@ -1406,11 +1556,13 @@ internal async Task<DiscordGuildTemplate> DeleteGuildTemplateAsync(ulong guildId
 	/// Gets the guild membership screening form async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<DiscordGuildMembershipScreening> GetGuildMembershipScreeningFormAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBER_VERIFICATION}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -1427,18 +1579,18 @@ internal async Task<DiscordGuildMembershipScreening> GetGuildMembershipScreening
 	/// <param name="enabled">The enabled.</param>
 	/// <param name="fields">The fields.</param>
 	/// <param name="description">The description.</param>
-
 	internal async Task<DiscordGuildMembershipScreening> ModifyGuildMembershipScreeningFormAsync(ulong guildId, Optional<bool> enabled, Optional<DiscordGuildMembershipScreeningField[]> fields, Optional<string> description)
 	{
 		var pld = new RestGuildMembershipScreeningFormModifyPayload
 		{
-			Enabled = enabled,
-			Description = description,
-			Fields = fields
+			Enabled = enabled, Description = description, Fields = fields
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBER_VERIFICATION}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -1452,11 +1604,13 @@ internal async Task<DiscordGuildMembershipScreening> ModifyGuildMembershipScreen
 	/// Gets the guild welcome screen async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<DiscordGuildWelcomeScreen> GetGuildWelcomeScreenAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WELCOME_SCREEN}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -1472,18 +1626,18 @@ internal async Task<DiscordGuildWelcomeScreen> GetGuildWelcomeScreenAsync(ulong
 	/// <param name="enabled">The enabled.</param>
 	/// <param name="welcomeChannels">The welcome channels.</param>
 	/// <param name="description">The description.</param>
-
 	internal async Task<DiscordGuildWelcomeScreen> ModifyGuildWelcomeScreenAsync(ulong guildId, Optional<bool> enabled, Optional<IEnumerable<DiscordGuildWelcomeScreenChannel>> welcomeChannels, Optional<string> description)
 	{
 		var pld = new RestGuildWelcomeScreenModifyPayload
 		{
-			Enabled = enabled,
-			WelcomeChannels = welcomeChannels,
-			Description = description
+			Enabled = enabled, WelcomeChannels = welcomeChannels, Description = description
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WELCOME_SCREEN}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -1499,18 +1653,18 @@ internal async Task<DiscordGuildWelcomeScreen> ModifyGuildWelcomeScreenAsync(ulo
 	/// <param name="channelId">The channel id.</param>
 	/// <param name="suppress">If true, suppress.</param>
 	/// <param name="requestToSpeakTimestamp">The request to speak timestamp.</param>
-
 	internal async Task UpdateCurrentUserVoiceStateAsync(ulong guildId, ulong channelId, bool? suppress, DateTimeOffset? requestToSpeakTimestamp)
 	{
 		var pld = new RestGuildUpdateCurrentUserVoiceStatePayload
 		{
-			ChannelId = channelId,
-			Suppress = suppress,
-			RequestToSpeakTimestamp = requestToSpeakTimestamp
+			ChannelId = channelId, Suppress = suppress, RequestToSpeakTimestamp = requestToSpeakTimestamp
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.VOICE_STATES}/@me";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -1523,17 +1677,18 @@ internal async Task UpdateCurrentUserVoiceStateAsync(ulong guildId, ulong channe
 	/// <param name="userId">The user_id.</param>
 	/// <param name="channelId">The channel id.</param>
 	/// <param name="suppress">If true, suppress.</param>
-
 	internal async Task UpdateUserVoiceStateAsync(ulong guildId, ulong userId, ulong channelId, bool? suppress)
 	{
 		var pld = new RestGuildUpdateUserVoiceStatePayload
 		{
-			ChannelId = channelId,
-			Suppress = suppress
+			ChannelId = channelId, Suppress = suppress
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.VOICE_STATES}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -1547,7 +1702,10 @@ internal async Task UpdateUserVoiceStateAsync(ulong guildId, ulong userId, ulong
 	internal async Task<ReadOnlyCollection<AutomodRule>> GetAutomodRulesAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id/auto-moderation/rules";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -1567,7 +1725,10 @@ internal async Task<ReadOnlyCollection<AutomodRule>> GetAutomodRulesAsync(ulong
 	internal async Task<AutomodRule> GetAutomodRuleAsync(ulong guildId, ulong ruleId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id/auto-moderation/rules/:rule_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { guild_id = guildId, rule_id = ruleId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId, rule_id = ruleId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -1591,11 +1752,24 @@ internal async Task<AutomodRule> GetAutomodRuleAsync(ulong guildId, ulong ruleId
 	/// <param name="exemptChannels">The exempt channels of the rule.</param>
 	/// <param name="reason">The reason for this addition.</param>
 	/// <returns>The new auto mod rule.</returns>
-	internal async Task<AutomodRule> CreateAutomodRuleAsync(ulong guildId, string name, AutomodEventType eventType, AutomodTriggerType triggerType, IEnumerable<AutomodAction> actions,
-		AutomodTriggerMetadata triggerMetadata = null, bool enabled = false, IEnumerable<ulong> exemptRoles = null, IEnumerable<ulong> exemptChannels = null, string reason = null)
+	internal async Task<AutomodRule> CreateAutomodRuleAsync(
+		ulong guildId,
+		string name,
+		AutomodEventType eventType,
+		AutomodTriggerType triggerType,
+		IEnumerable<AutomodAction> actions,
+		AutomodTriggerMetadata triggerMetadata = null,
+		bool enabled = false,
+		IEnumerable<ulong> exemptRoles = null,
+		IEnumerable<ulong> exemptChannels = null,
+		string reason = null
+	)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id/auto-moderation/rules";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		RestAutomodRuleModifyPayload pld = new()
 		{
@@ -1617,15 +1791,13 @@ internal async Task<AutomodRule> CreateAutomodRuleAsync(ulong guildId, string na
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
-		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
+		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 		var ret = DiscordJson.DeserializeObject<AutomodRule>(res.Response, this.Discord);
 		ret.Discord = this.Discord;
 
 		if (this.Discord is DiscordClient dc)
-		{
 			await dc.OnAutomodRuleCreated(ret).ConfigureAwait(false);
-		}
 
 		return ret;
 	}
@@ -1644,15 +1816,22 @@ internal async Task<AutomodRule> CreateAutomodRuleAsync(ulong guildId, string na
 	/// <param name="exemptChannels">The new exempt channels of the rule.</param>
 	/// <param name="reason">The reason for this modification.</param>
 	/// <returns>The updated automod rule</returns>
-	internal async Task<AutomodRule> ModifyAutomodRuleAsync(ulong guildId, ulong ruleId, Optional<string> name, Optional<AutomodEventType> eventType, Optional<AutomodTriggerMetadata> metadata, Optional<List<AutomodAction>> actions,
-		Optional<bool> enabled, Optional<List<ulong>> exemptRoles, Optional<List<ulong>> exemptChannels, string reason = null)
+	internal async Task<AutomodRule> ModifyAutomodRuleAsync(
+		ulong guildId,
+		ulong ruleId,
+		Optional<string> name,
+		Optional<AutomodEventType> eventType,
+		Optional<AutomodTriggerMetadata> metadata,
+		Optional<List<AutomodAction>> actions,
+		Optional<bool> enabled,
+		Optional<List<ulong>> exemptRoles,
+		Optional<List<ulong>> exemptChannels,
+		string reason = null
+	)
 	{
 		var pld = new RestAutomodRuleModifyPayload
 		{
-			Name = name,
-			EventType = eventType,
-			TriggerMetadata = metadata,
-			Enabled = enabled
+			Name = name, EventType = eventType, TriggerMetadata = metadata, Enabled = enabled
 		};
 
 		if (actions.HasValue)
@@ -1667,18 +1846,19 @@ internal async Task<AutomodRule> ModifyAutomodRuleAsync(ulong guildId, ulong rul
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id/auto-moderation/rules/:rule_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { guild_id = guildId, rule_id = ruleId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId, rule_id = ruleId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
-		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
+		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 		var ret = DiscordJson.DeserializeObject<AutomodRule>(res.Response, this.Discord);
 		ret.Discord = this.Discord;
 
 		if (this.Discord is DiscordClient dc)
-		{
 			await dc.OnAutomodRuleUpdated(ret).ConfigureAwait(false);
-		}
 
 		return ret;
 	}
@@ -1693,7 +1873,10 @@ internal async Task<AutomodRule> ModifyAutomodRuleAsync(ulong guildId, ulong rul
 	internal async Task<AutomodRule> DeleteAutomodRuleAsync(ulong guildId, ulong ruleId, string reason = null)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id/auto-moderation/rules/:rule_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new { guild_id = guildId, rule_id = ruleId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId, rule_id = ruleId
+		}, out var path);
 
 		var headers = Utilities.GetBaseHeaders();
 		if (!string.IsNullOrWhiteSpace(reason))
@@ -1706,18 +1889,16 @@ internal async Task<AutomodRule> DeleteAutomodRuleAsync(ulong guildId, ulong rul
 		ret.Discord = this.Discord;
 
 		if (this.Discord is DiscordClient dc)
-		{
 			await dc.OnAutomodRuleDeleted(ret).ConfigureAwait(false);
-		}
 
 		return ret;
 	}
 
-	#endregion
+#endregion
 
 	// End todo
 
-	#region Guild Scheduled Events
+#region Guild Scheduled Events
 
 	/// <summary>
 	/// Creates a scheduled event.
@@ -1741,7 +1922,10 @@ internal async Task<DiscordScheduledEvent> CreateGuildScheduledEventAsync(ulong
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -1763,7 +1947,20 @@ internal async Task<DiscordScheduledEvent> CreateGuildScheduledEventAsync(ulong
 	/// <summary>
 	/// Modifies a scheduled event.
 	/// </summary>
-	internal async Task<DiscordScheduledEvent> ModifyGuildScheduledEventAsync(ulong guildId, ulong scheduledEventId, Optional<ulong?> channelId, Optional<DiscordScheduledEventEntityMetadata> metadata, Optional<string> name, Optional<DateTimeOffset> scheduledStartTime, Optional<DateTimeOffset> scheduledEndTime, Optional<string> description, Optional<ScheduledEventEntityType> type, Optional<ScheduledEventStatus> status, Optional<string> coverb64, string reason = null)
+	internal async Task<DiscordScheduledEvent> ModifyGuildScheduledEventAsync(
+		ulong guildId,
+		ulong scheduledEventId,
+		Optional<ulong?> channelId,
+		Optional<DiscordScheduledEventEntityMetadata> metadata,
+		Optional<string> name,
+		Optional<DateTimeOffset> scheduledStartTime,
+		Optional<DateTimeOffset> scheduledEndTime,
+		Optional<string> description,
+		Optional<ScheduledEventEntityType> type,
+		Optional<ScheduledEventStatus> status,
+		Optional<string> coverb64,
+		string reason = null
+	)
 	{
 		var pld = new RestGuildScheduledEventModifyPayload
 		{
@@ -1783,7 +1980,10 @@ internal async Task<DiscordScheduledEvent> ModifyGuildScheduledEventAsync(ulong
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}/:scheduled_event_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, scheduled_event_id = scheduledEventId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId, scheduled_event_id = scheduledEventId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -1828,7 +2028,10 @@ internal async Task<DiscordScheduledEvent> ModifyGuildScheduledEventStatusAsync(
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}/:scheduled_event_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, scheduled_event_id = scheduledEventId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId, scheduled_event_id = scheduledEventId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -1871,7 +2074,10 @@ internal async Task<DiscordScheduledEvent> GetGuildScheduledEventAsync(ulong gui
 			urlParams["with_user_count"] = withUserCount?.ToString();
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}/:scheduled_event_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, scheduled_event_id = scheduledEventId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId, scheduled_event_id = scheduledEventId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 
@@ -1911,7 +2117,10 @@ internal async Task<IReadOnlyDictionary<ulong, DiscordScheduledEvent>> ListGuild
 			urlParams["with_user_count"] = withUserCount?.ToString();
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -1955,7 +2164,10 @@ internal Task DeleteGuildScheduledEventAsync(ulong guildId, ulong scheduledEvent
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}/:scheduled_event_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, scheduled_event_id = scheduledEventId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId, scheduled_event_id = scheduledEventId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
@@ -1985,7 +2197,10 @@ internal async Task<IReadOnlyDictionary<ulong, DiscordScheduledEventUser>> GetGu
 			urlParams["with_member"] = withMember.Value.ToString(CultureInfo.InvariantCulture);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}/:scheduled_event_id{Endpoints.USERS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, scheduled_event_id = scheduledEventId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId, scheduled_event_id = scheduledEventId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -1995,7 +2210,6 @@ internal async Task<IReadOnlyDictionary<ulong, DiscordScheduledEventUser>> GetGu
 
 		foreach (var rspvUser in rspvUsers)
 		{
-
 			rspvUser.Discord = this.Discord;
 			rspvUser.GuildId = guildId;
 
@@ -2020,11 +2234,13 @@ internal async Task<IReadOnlyDictionary<ulong, DiscordScheduledEventUser>> GetGu
 
 		return new ReadOnlyDictionary<ulong, DiscordScheduledEventUser>(new Dictionary<ulong, DiscordScheduledEventUser>(rspv));
 	}
-	#endregion
+
+#endregion
 
 	// begin todo
 
-	#region Channel
+#region Channel
+
 	/// <summary>
 	/// Creates a guild channel.
 	/// </summary>
@@ -2071,7 +2287,10 @@ internal async Task<DiscordChannel> CreateGuildChannelAsync(ulong guildId, strin
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.CHANNELS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -2098,14 +2317,25 @@ internal async Task<DiscordChannel> CreateGuildChannelAsync(ulong guildId, strin
 	/// <param name="defaultAutoArchiveDuration">The default auto archive duration.</param>
 	/// <param name="reason">The reason.</param>
 	[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "<Pending>")]
-	internal async Task<DiscordChannel> CreateForumChannelAsync(ulong guildId, string name, ulong? parent,
-		Optional<string> topic, Optional<string> template,
-		bool? nsfw, Optional<ForumReactionEmoji> defaultReactionEmoji,
+	internal async Task<DiscordChannel> CreateForumChannelAsync(
+		ulong guildId,
+		string name,
+		ulong? parent,
+		Optional<string> topic,
+		Optional<string> template,
+		bool? nsfw,
+		Optional<ForumReactionEmoji> defaultReactionEmoji,
 #pragma warning disable CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)
-		Optional<int?> perUserRateLimit, Optional<int?> postCreateUserRateLimit, Optional<ForumPostSortOrder> defaultSortOrder,
+		Optional<int?> perUserRateLimit,
+		Optional<int?> postCreateUserRateLimit,
+		Optional<ForumPostSortOrder> defaultSortOrder,
 #pragma warning restore CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)
 #pragma warning disable CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)
-		ThreadAutoArchiveDuration? defaultAutoArchiveDuration, IEnumerable<DiscordOverwriteBuilder> permissionOverwrites, Optional<ChannelFlags?> flags, string reason)
+		ThreadAutoArchiveDuration? defaultAutoArchiveDuration,
+		IEnumerable<DiscordOverwriteBuilder> permissionOverwrites,
+		Optional<ChannelFlags?> flags,
+		string reason
+	)
 #pragma warning restore CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)
 	{
 		List<DiscordRestOverwrite> restoverwrites = null;
@@ -2138,7 +2368,10 @@ internal async Task<DiscordChannel> CreateForumChannelAsync(ulong guildId, strin
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.CHANNELS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -2168,7 +2401,24 @@ internal async Task<DiscordChannel> CreateForumChannelAsync(ulong guildId, strin
 	/// <param name="permissionOverwrites">The permission overwrites.</param>
 	/// <param name="reason">The reason.</param>
 #pragma warning disable CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)
-	internal Task ModifyChannelAsync(ulong channelId, string name, int? position, Optional<string> topic, bool? nsfw, Optional<ulong?> parent, Optional<int?> bitrate, Optional<int?> userLimit, Optional<int?> perUserRateLimit, Optional<string> rtcRegion, VideoQualityMode? qualityMode, ThreadAutoArchiveDuration? autoArchiveDuration, Optional<ChannelType> type, IEnumerable<DiscordOverwriteBuilder> permissionOverwrites, Optional<ChannelFlags?> flags, string reason)
+	internal Task ModifyChannelAsync(
+		ulong channelId,
+		string name,
+		int? position,
+		Optional<string> topic,
+		bool? nsfw,
+		Optional<ulong?> parent,
+		Optional<int?> bitrate,
+		Optional<int?> userLimit,
+		Optional<int?> perUserRateLimit,
+		Optional<string> rtcRegion,
+		VideoQualityMode? qualityMode,
+		ThreadAutoArchiveDuration? autoArchiveDuration,
+		Optional<ChannelType> type,
+		IEnumerable<DiscordOverwriteBuilder> permissionOverwrites,
+		Optional<ChannelFlags?> flags,
+		string reason
+	)
 #pragma warning restore CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)
 	{
 		List<DiscordRestOverwrite> restoverwrites = null;
@@ -2202,18 +2452,34 @@ internal Task ModifyChannelAsync(ulong channelId, string name, int? position, Op
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 	}
 
 	[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "<Pending>")]
-	internal async Task<DiscordChannel> ModifyForumChannelAsync(ulong channelId, string name, int? position,
-		Optional<string> topic, Optional<string> template, bool? nsfw,
-		Optional<ulong?> parent, Optional<List<ForumPostTag>?> availableTags, Optional<ForumReactionEmoji> defaultReactionEmoji,
-		Optional<int?> perUserRateLimit, Optional<int?> postCreateUserRateLimit, Optional<ForumPostSortOrder?> defaultSortOrder,
-		Optional<ThreadAutoArchiveDuration?> defaultAutoArchiveDuration, IEnumerable<DiscordOverwriteBuilder> permissionOverwrites, Optional<ChannelFlags?> flags, string reason)
+	internal async Task<DiscordChannel> ModifyForumChannelAsync(
+		ulong channelId,
+		string name,
+		int? position,
+		Optional<string> topic,
+		Optional<string> template,
+		bool? nsfw,
+		Optional<ulong?> parent,
+		Optional<List<ForumPostTag>?> availableTags,
+		Optional<ForumReactionEmoji> defaultReactionEmoji,
+		Optional<int?> perUserRateLimit,
+		Optional<int?> postCreateUserRateLimit,
+		Optional<ForumPostSortOrder?> defaultSortOrder,
+		Optional<ThreadAutoArchiveDuration?> defaultAutoArchiveDuration,
+		IEnumerable<DiscordOverwriteBuilder> permissionOverwrites,
+		Optional<ChannelFlags?> flags,
+		string reason
+	)
 	{
 		List<DiscordRestOverwrite> restoverwrites = null;
 		if (permissionOverwrites != null)
@@ -2246,7 +2512,10 @@ internal async Task<DiscordChannel> ModifyForumChannelAsync(ulong channelId, str
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 
@@ -2261,11 +2530,13 @@ internal async Task<DiscordChannel> ModifyForumChannelAsync(ulong channelId, str
 	/// Gets the channel async.
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
-
 	internal async Task<DiscordChannel> GetChannelAsync(ulong channelId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -2281,7 +2552,6 @@ internal async Task<DiscordChannel> GetChannelAsync(ulong channelId)
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task DeleteChannelAsync(ulong channelId, string reason)
 	{
 		var headers = Utilities.GetBaseHeaders();
@@ -2289,7 +2559,10 @@ internal Task DeleteChannelAsync(ulong channelId, string reason)
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
@@ -2300,11 +2573,13 @@ internal Task DeleteChannelAsync(ulong channelId, string reason)
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="messageId">The message_id.</param>
-
 	internal async Task<DiscordMessage> GetMessageAsync(ulong channelId, ulong messageId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId, message_id = messageId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId, message_id = messageId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -2347,7 +2622,12 @@ internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, string c
 		{
 			HasContent = content != null,
 			Content = content,
-			StickersIds = sticker is null ? Array.Empty<ulong>() : new[] {sticker.Id},
+			StickersIds = sticker is null
+				? Array.Empty<ulong>()
+				: new[]
+				{
+					sticker.Id
+				},
 			IsTts = false,
 			HasEmbed = embeds?.Any() ?? false,
 			Embeds = embeds,
@@ -2355,13 +2635,19 @@ internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, string c
 		};
 
 		if (replyMessageId != null)
-			pld.MessageReference = new InternalDiscordMessageReference { MessageId = replyMessageId, FailIfNotExists = failOnInvalidReply };
+			pld.MessageReference = new InternalDiscordMessageReference
+			{
+				MessageId = replyMessageId, FailIfNotExists = failOnInvalidReply
+			};
 
 		if (replyMessageId != null)
 			pld.Mentions = new(Mentions.All, true, mentionReply);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -2376,7 +2662,6 @@ internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, string c
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="builder">The builder.</param>
-
 	internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, DiscordMessageBuilder builder)
 	{
 		builder.Validate();
@@ -2390,7 +2675,12 @@ internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, DiscordM
 		{
 			HasContent = builder.Content != null,
 			Content = builder.Content,
-			StickersIds = builder.Sticker is null ? Array.Empty<ulong>() : new[] {builder.Sticker.Id},
+			StickersIds = builder.Sticker is null
+				? Array.Empty<ulong>()
+				: new[]
+				{
+					builder.Sticker.Id
+				},
 			IsTts = builder.IsTts,
 			HasEmbed = builder.Embeds != null,
 			Embeds = builder.Embeds,
@@ -2398,7 +2688,10 @@ internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, DiscordM
 		};
 
 		if (builder.ReplyId != null)
-			pld.MessageReference = new InternalDiscordMessageReference { MessageId = builder.ReplyId, FailIfNotExists = builder.FailOnInvalidReply };
+			pld.MessageReference = new InternalDiscordMessageReference
+			{
+				MessageId = builder.ReplyId, FailIfNotExists = builder.FailOnInvalidReply
+			};
 
 		pld.Mentions = new(builder.Mentions ?? Mentions.All, builder.Mentions?.Any() ?? false, builder.MentionOnReply);
 
@@ -2414,11 +2707,15 @@ internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, DiscordM
 					attachments.Add(att);
 					fileId++;
 				}
+
 				pld.Attachments = attachments;
 			}
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}";
-			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
+			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+			{
+				channel_id = channelId
+			}, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -2434,14 +2731,12 @@ internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, DiscordM
 			{
 				DiscordAttachment att = new()
 				{
-					Id = fileId,
-					Discord = this.Discord,
-					Description = file.Description,
-					Filename = file.Filename
+					Id = fileId, Discord = this.Discord, Description = file.Description, Filename = file.Filename
 				};
 				attachments.Add(att);
 				fileId++;
 			}
+
 			pld.Attachments = attachments;
 
 			var values = new Dictionary<string, string>
@@ -2450,7 +2745,10 @@ internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, DiscordM
 			};
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}";
-			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
+			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+			{
+				channel_id = channelId
+			}, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoMultipartAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, values: values, files: builder.Files).ConfigureAwait(false);
@@ -2458,9 +2756,7 @@ internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, DiscordM
 			var ret = this.PrepareMessage(JObject.Parse(res.Response));
 
 			foreach (var file in builder.FilesInternal.Where(x => x.ResetPositionTo.HasValue))
-			{
 				file.Stream.Position = file.ResetPositionTo.Value;
-			}
 
 			return ret;
 		}
@@ -2470,16 +2766,22 @@ internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, DiscordM
 	/// Gets the guild channels async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<IReadOnlyList<DiscordChannel>> GetGuildChannelsAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.CHANNELS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-		var channelsRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordChannel>>(res.Response).Select(xc => { xc.Discord = this.Discord; return xc; });
+		var channelsRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordChannel>>(res.Response).Select(xc =>
+		{
+			xc.Discord = this.Discord;
+			return xc;
+		});
 
 		foreach (var ret in channelsRaw)
 			ret.Initialize(this.Discord);
@@ -2500,7 +2802,10 @@ internal Task ModifyVoiceChannelStatusAsync(ulong channelId, string? status)
 		};
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.VOICE_STATUS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new { channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, payload: DiscordJson.SerializeObject(pld));
@@ -2518,14 +2823,12 @@ internal async Task<DiscordStageInstance> CreateStageInstanceAsync(ulong channel
 	{
 		var pld = new RestStageInstanceCreatePayload
 		{
-			ChannelId = channelId,
-			Topic = topic,
-			ScheduledEventId = scheduledEventId,
-			SendStartNotification = sendStartNotification
+			ChannelId = channelId, Topic = topic, ScheduledEventId = scheduledEventId, SendStartNotification = sendStartNotification
 		};
 
 		var route = $"{Endpoints.STAGE_INSTANCES}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+			{ }, out var path);
 		var headers = Utilities.GetBaseHeaders();
 		if (!string.IsNullOrWhiteSpace(reason))
 			headers.Add(REASON_HEADER_NAME, reason);
@@ -2545,7 +2848,10 @@ internal async Task<DiscordStageInstance> CreateStageInstanceAsync(ulong channel
 	internal async Task<DiscordStageInstance> GetStageInstanceAsync(ulong channelId)
 	{
 		var route = $"{Endpoints.STAGE_INSTANCES}/:channel_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -2569,7 +2875,10 @@ internal Task ModifyStageInstanceAsync(ulong channelId, Optional<string> topic,
 		};
 
 		var route = $"{Endpoints.STAGE_INSTANCES}/:channel_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 		var headers = Utilities.GetBaseHeaders();
 		if (!string.IsNullOrWhiteSpace(reason))
 			headers.Add(REASON_HEADER_NAME, reason);
@@ -2586,7 +2895,10 @@ internal Task ModifyStageInstanceAsync(ulong channelId, Optional<string> topic,
 	internal Task DeleteStageInstanceAsync(ulong channelId, string reason)
 	{
 		var route = $"{Endpoints.STAGE_INSTANCES}/:channel_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 		var headers = Utilities.GetBaseHeaders();
 		if (!string.IsNullOrWhiteSpace(reason))
 			headers.Add(REASON_HEADER_NAME, reason);
@@ -2603,7 +2915,6 @@ internal Task DeleteStageInstanceAsync(ulong channelId, string reason)
 	/// <param name="before">The before.</param>
 	/// <param name="after">The after.</param>
 	/// <param name="around">The around.</param>
-
 	internal async Task<IReadOnlyList<DiscordMessage>> GetChannelMessagesAsync(ulong channelId, int limit, ulong? before, ulong? after, ulong? around)
 	{
 		var urlParams = new Dictionary<string, string>();
@@ -2617,7 +2928,10 @@ internal async Task<IReadOnlyList<DiscordMessage>> GetChannelMessagesAsync(ulong
 			urlParams["limit"] = limit.ToString(CultureInfo.InvariantCulture);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -2635,11 +2949,13 @@ internal async Task<IReadOnlyList<DiscordMessage>> GetChannelMessagesAsync(ulong
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="messageId">The message_id.</param>
-
 	internal async Task<DiscordMessage> GetChannelMessageAsync(ulong channelId, ulong messageId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId, message_id = messageId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId, message_id = messageId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -2661,7 +2977,6 @@ internal async Task<DiscordMessage> GetChannelMessageAsync(ulong channelId, ulon
 	/// <param name="suppressEmbed">The suppress_embed.</param>
 	/// <param name="files">The files.</param>
 	/// <param name="attachments">The attachments to keep.</param>
-
 	internal async Task<DiscordMessage> EditMessageAsync(ulong channelId, ulong messageId, Optional<string> content, Optional<IEnumerable<DiscordEmbed>> embeds, Optional<IEnumerable<IMention>> mentions, IReadOnlyList<DiscordActionRowComponent> components, Optional<bool> suppressEmbed, IReadOnlyCollection<DiscordMessageFile> files, Optional<IEnumerable<DiscordAttachment>> attachments)
 	{
 		if (embeds.HasValue && embeds.Value != null)
@@ -2678,8 +2993,8 @@ internal async Task<DiscordMessage> EditMessageAsync(ulong channelId, ulong mess
 			Components = components,
 			Flags = suppressEmbed.HasValue && (bool)suppressEmbed ? MessageFlags.SuppressedEmbeds : null,
 			Mentions = mentions
-			.Map(m => new DiscordMentions(m ?? Mentions.None, false, mentions.Value?.OfType<RepliedUserMention>().Any() ?? false))
-			.ValueOrDefault()
+				.Map(m => new DiscordMentions(m ?? Mentions.None, false, mentions.Value?.OfType<RepliedUserMention>().Any() ?? false))
+				.ValueOrDefault()
 		};
 
 		if (files?.Count > 0)
@@ -2690,14 +3005,12 @@ internal async Task<DiscordMessage> EditMessageAsync(ulong channelId, ulong mess
 			{
 				DiscordAttachment att = new()
 				{
-					Id = fileId,
-					Discord = this.Discord,
-					Description = file.Description,
-					Filename = file.Filename
+					Id = fileId, Discord = this.Discord, Description = file.Description, Filename = file.Filename
 				};
 				attachmentsNew.Add(att);
 				fileId++;
 			}
+
 			if (attachments.HasValue && attachments.Value.Any())
 				attachmentsNew.AddRange(attachments.Value);
 
@@ -2709,7 +3022,10 @@ internal async Task<DiscordMessage> EditMessageAsync(ulong channelId, ulong mess
 			};
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id";
-			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {channel_id = channelId, message_id = messageId }, out var path);
+			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+			{
+				channel_id = channelId, message_id = messageId
+			}, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoMultipartAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, values: values, files: files).ConfigureAwait(false);
@@ -2717,9 +3033,7 @@ internal async Task<DiscordMessage> EditMessageAsync(ulong channelId, ulong mess
 			var ret = this.PrepareMessage(JObject.Parse(res.Response));
 
 			foreach (var file in files.Where(x => x.ResetPositionTo.HasValue))
-			{
 				file.Stream.Position = file.ResetPositionTo.Value;
-			}
 
 			return ret;
 		}
@@ -2728,7 +3042,10 @@ internal async Task<DiscordMessage> EditMessageAsync(ulong channelId, ulong mess
 			pld.Attachments = attachments.ValueOrDefault();
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id";
-			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {channel_id = channelId, message_id = messageId }, out var path);
+			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+			{
+				channel_id = channelId, message_id = messageId
+			}, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -2745,7 +3062,6 @@ internal async Task<DiscordMessage> EditMessageAsync(ulong channelId, ulong mess
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="messageId">The message_id.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task DeleteMessageAsync(ulong channelId, ulong messageId, string reason)
 	{
 		var headers = Utilities.GetBaseHeaders();
@@ -2753,7 +3069,10 @@ internal Task DeleteMessageAsync(ulong channelId, ulong messageId, string reason
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId, message_id = messageId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
@@ -2765,7 +3084,6 @@ internal Task DeleteMessageAsync(ulong channelId, ulong messageId, string reason
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="messageIds">The message_ids.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task DeleteMessagesAsync(ulong channelId, IEnumerable<ulong> messageIds, string reason)
 	{
 		var pld = new RestChannelMessageBulkDeletePayload
@@ -2778,7 +3096,10 @@ internal Task DeleteMessagesAsync(ulong channelId, IEnumerable<ulong> messageIds
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}{Endpoints.BULK_DELETE}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld));
@@ -2788,16 +3109,22 @@ internal Task DeleteMessagesAsync(ulong channelId, IEnumerable<ulong> messageIds
 	/// Gets the channel invites async.
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
-
 	internal async Task<IReadOnlyList<DiscordInvite>> GetChannelInvitesAsync(ulong channelId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.INVITES}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-		var invitesRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordInvite>>(res.Response).Select(xi => { xi.Discord = this.Discord; return xi; });
+		var invitesRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordInvite>>(res.Response).Select(xi =>
+		{
+			xi.Discord = this.Discord;
+			return xi;
+		});
 
 		return new ReadOnlyCollection<DiscordInvite>(new List<DiscordInvite>(invitesRaw));
 	}
@@ -2814,7 +3141,6 @@ internal async Task<IReadOnlyList<DiscordInvite>> GetChannelInvitesAsync(ulong c
 	/// <param name="temporary">If true, temporary.</param>
 	/// <param name="unique">If true, unique.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal async Task<DiscordInvite> CreateChannelInviteAsync(ulong channelId, int maxAge, int maxUses, TargetType? targetType, ulong? targetApplicationId, ulong? targetUser, bool temporary, bool unique, string reason)
 	{
 		var pld = new RestChannelInviteCreatePayload
@@ -2833,7 +3159,10 @@ internal async Task<DiscordInvite> CreateChannelInviteAsync(ulong channelId, int
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.INVITES}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -2850,7 +3179,6 @@ internal async Task<DiscordInvite> CreateChannelInviteAsync(ulong channelId, int
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="overwriteId">The overwrite_id.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task DeleteChannelPermissionAsync(ulong channelId, ulong overwriteId, string reason)
 	{
 		var headers = Utilities.GetBaseHeaders();
@@ -2858,7 +3186,10 @@ internal Task DeleteChannelPermissionAsync(ulong channelId, ulong overwriteId, s
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.PERMISSIONS}/:overwrite_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, overwrite_id = overwriteId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId, overwrite_id = overwriteId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
@@ -2873,14 +3204,11 @@ internal Task DeleteChannelPermissionAsync(ulong channelId, ulong overwriteId, s
 	/// <param name="deny">The deny.</param>
 	/// <param name="type">The type.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task EditChannelPermissionsAsync(ulong channelId, ulong overwriteId, Permissions allow, Permissions deny, string type, string reason)
 	{
 		var pld = new RestChannelPermissionEditPayload
 		{
-			Type = type,
-			Allow = allow & PermissionMethods.FullPerms,
-			Deny = deny & PermissionMethods.FullPerms
+			Type = type, Allow = allow & PermissionMethods.FullPerms, Deny = deny & PermissionMethods.FullPerms
 		};
 
 		var headers = Utilities.GetBaseHeaders();
@@ -2888,7 +3216,10 @@ internal Task EditChannelPermissionsAsync(ulong channelId, ulong overwriteId, Pe
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.PERMISSIONS}/:overwrite_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId, overwrite_id = overwriteId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			channel_id = channelId, overwrite_id = overwriteId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, headers, DiscordJson.SerializeObject(pld));
@@ -2898,11 +3229,13 @@ internal Task EditChannelPermissionsAsync(ulong channelId, ulong overwriteId, Pe
 	/// Triggers the typing async.
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
-
 	internal Task TriggerTypingAsync(ulong channelId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.TYPING}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route);
@@ -2912,11 +3245,13 @@ internal Task TriggerTypingAsync(ulong channelId)
 	/// Gets the pinned messages async.
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
-
 	internal async Task<IReadOnlyList<DiscordMessage>> GetPinnedMessagesAsync(ulong channelId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.PINS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -2934,11 +3269,13 @@ internal async Task<IReadOnlyList<DiscordMessage>> GetPinnedMessagesAsync(ulong
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="messageId">The message_id.</param>
-
 	internal Task PinMessageAsync(ulong channelId, ulong messageId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.PINS}/:message_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId, message_id = messageId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			channel_id = channelId, message_id = messageId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route);
@@ -2949,11 +3286,13 @@ internal Task PinMessageAsync(ulong channelId, ulong messageId)
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="messageId">The message_id.</param>
-
 	internal Task UnpinMessageAsync(ulong channelId, ulong messageId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.PINS}/:message_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId, message_id = messageId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
@@ -2966,17 +3305,18 @@ internal Task UnpinMessageAsync(ulong channelId, ulong messageId)
 	/// <param name="userId">The user_id.</param>
 	/// <param name="accessToken">The access_token.</param>
 	/// <param name="nickname">The nickname.</param>
-
 	internal Task AddGroupDmRecipientAsync(ulong channelId, ulong userId, string accessToken, string nickname)
 	{
 		var pld = new RestChannelGroupDmRecipientAddPayload
 		{
-			AccessToken = accessToken,
-			Nickname = nickname
+			AccessToken = accessToken, Nickname = nickname
 		};
 
 		var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CHANNELS}/:channel_id{Endpoints.RECIPIENTS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			channel_id = channelId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, payload: DiscordJson.SerializeObject(pld));
@@ -2987,11 +3327,13 @@ internal Task AddGroupDmRecipientAsync(ulong channelId, ulong userId, string acc
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="userId">The user_id.</param>
-
 	internal Task RemoveGroupDmRecipientAsync(ulong channelId, ulong userId)
 	{
 		var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CHANNELS}/:channel_id{Endpoints.RECIPIENTS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
@@ -3002,17 +3344,16 @@ internal Task RemoveGroupDmRecipientAsync(ulong channelId, ulong userId)
 	/// </summary>
 	/// <param name="accessTokens">The access_tokens.</param>
 	/// <param name="nicks">The nicks.</param>
-
 	internal async Task<DiscordDmChannel> CreateGroupDmAsync(IEnumerable<string> accessTokens, IDictionary<ulong, string> nicks)
 	{
 		var pld = new RestUserGroupDmCreatePayload
 		{
-			AccessTokens = accessTokens,
-			Nicknames = nicks
+			AccessTokens = accessTokens, Nicknames = nicks
 		};
 
 		var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CHANNELS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -3026,7 +3367,6 @@ internal async Task<DiscordDmChannel> CreateGroupDmAsync(IEnumerable<string> acc
 	/// Creates the dm async.
 	/// </summary>
 	/// <param name="recipientId">The recipient_id.</param>
-
 	internal async Task<DiscordDmChannel> CreateDmAsync(ulong recipientId)
 	{
 		var pld = new RestUserDmCreatePayload
@@ -3035,7 +3375,8 @@ internal async Task<DiscordDmChannel> CreateDmAsync(ulong recipientId)
 		};
 
 		var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CHANNELS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -3050,7 +3391,6 @@ internal async Task<DiscordDmChannel> CreateDmAsync(ulong recipientId)
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="webhookChannelId">The webhook_channel_id.</param>
-
 	internal async Task<DiscordFollowedChannel> FollowChannelAsync(ulong channelId, ulong webhookChannelId)
 	{
 		var pld = new FollowedChannelAddPayload
@@ -3059,7 +3399,10 @@ internal async Task<DiscordFollowedChannel> FollowChannelAsync(ulong channelId,
 		};
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.FOLLOWERS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var response = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -3072,22 +3415,25 @@ internal async Task<DiscordFollowedChannel> FollowChannelAsync(ulong channelId,
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="messageId">The message_id.</param>
-
 	internal async Task<DiscordMessage> CrosspostMessageAsync(ulong channelId, ulong messageId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.CROSSPOST}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId, message_id = messageId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			channel_id = channelId, message_id = messageId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var response = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route).ConfigureAwait(false);
 		return DiscordJson.DeserializeObject<DiscordMessage>(response.Response, this.Discord);
 	}
 
-	#endregion
+#endregion
 
 	// End todo
 
-	#region Member
+#region Member
+
 	/// <summary>
 	/// Gets the current user async.
 	/// </summary>
@@ -3108,7 +3454,10 @@ internal Task<DiscordUser> GetUserAsync(ulong userId)
 	internal async Task<DiscordUser> GetUserAsync(string userId)
 	{
 		var route = $"{Endpoints.USERS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3121,7 +3470,10 @@ internal async Task<DiscordUser> GetUserAsync(string userId)
 				RawActivity = new(),
 				Activity = new(),
 				Status = UserStatus.Offline,
-				InternalUser = new() { Id = duser.Id }
+				InternalUser = new()
+				{
+					Id = duser.Id
+				}
 			};
 		return duser;
 	}
@@ -3134,14 +3486,20 @@ internal async Task<DiscordUser> GetUserAsync(string userId)
 	internal async Task<DiscordMember> GetGuildMemberAsync(ulong guildId, ulong userId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 		var tm = DiscordJson.DeserializeObject<TransportMember>(res.Response, this.Discord);
 
-		var usr = new DiscordUser(tm.User) { Discord = this.Discord };
+		var usr = new DiscordUser(tm.User)
+		{
+			Discord = this.Discord
+		};
 		usr = this.Discord.UserCache.AddOrUpdate(tm.User.Id, usr, (id, old) =>
 		{
 			old.Username = usr.Username;
@@ -3154,16 +3512,12 @@ internal async Task<DiscordMember> GetGuildMemberAsync(ulong guildId, ulong user
 		if (this.Discord.Configuration.Intents.HasIntent(DiscordIntents.GuildPresences) && usr.Presence == null && this.Discord is DiscordClient dc)
 			dc.PresencesInternal[usr.Id] = new()
 			{
-				Discord = dc,
-				RawActivity = new(),
-				Activity = new(),
-				Status = UserStatus.Offline
+				Discord = dc, RawActivity = new(), Activity = new(), Status = UserStatus.Offline
 			};
 
 		return new(tm)
 		{
-			Discord = this.Discord,
-			GuildId = guildId
+			Discord = this.Discord, GuildId = guildId
 		};
 	}
 
@@ -3173,7 +3527,6 @@ internal async Task<DiscordMember> GetGuildMemberAsync(ulong guildId, ulong user
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="userId">The user_id.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task RemoveGuildMemberAsync(ulong guildId, ulong userId, string reason)
 	{
 		var urlParams = new Dictionary<string, string>();
@@ -3181,7 +3534,10 @@ internal Task RemoveGuildMemberAsync(ulong guildId, ulong userId, string reason)
 			urlParams["reason"] = reason;
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, BuildQueryString(urlParams), this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
@@ -3192,18 +3548,16 @@ internal Task RemoveGuildMemberAsync(ulong guildId, ulong userId, string reason)
 	/// </summary>
 	/// <param name="username">The username.</param>
 	/// <param name="base64Avatar">The base64_avatar.</param>
-
 	internal async Task<DiscordUser> ModifyCurrentUserAsync(string username, Optional<string> base64Avatar)
 	{
 		var pld = new RestUserUpdateCurrentPayload
 		{
-			Username = username,
-			AvatarBase64 = base64Avatar.ValueOrDefault(),
-			AvatarSet = base64Avatar.HasValue
+			Username = username, AvatarBase64 = base64Avatar.ValueOrDefault(), AvatarSet = base64Avatar.HasValue
 		};
 
 		var route = $"{Endpoints.USERS}{Endpoints.ME}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -3218,12 +3572,12 @@ internal async Task<DiscordUser> ModifyCurrentUserAsync(string username, Optiona
 	/// <param name="limit">The limit.</param>
 	/// <param name="before">The before.</param>
 	/// <param name="after">The after.</param>
-
 	internal async Task<IReadOnlyList<DiscordGuild>> GetCurrentUserGuildsAsync(int limit = 100, ulong? before = null, ulong? after = null)
 	{
 		var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.GUILDS}";
 
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration)
 			.AddParameter($"limit", limit.ToString(CultureInfo.InvariantCulture));
@@ -3242,9 +3596,7 @@ internal async Task<IReadOnlyList<DiscordGuild>> GetCurrentUserGuildsAsync(int l
 			return new ReadOnlyCollection<DiscordGuild>(new List<DiscordGuild>(glds));
 		}
 		else
-		{
 			return DiscordJson.DeserializeIEnumerableObject<List<DiscordGuild>>(res.Response, this.Discord);
-		}
 	}
 
 	/// <summary>
@@ -3260,9 +3612,18 @@ internal async Task<IReadOnlyList<DiscordGuild>> GetCurrentUserGuildsAsync(int l
 	/// <param name="verify">Whether to verify the member.</param>
 	/// <param name="flags">The member flags</param>
 	/// <param name="reason">The reason.</param>
-	internal Task ModifyGuildMemberAsync(ulong guildId, ulong userId, Optional<string> nick,
-		Optional<IEnumerable<ulong>> roleIds, Optional<bool> mute, Optional<bool> deaf,
-		Optional<ulong?> voiceChannelId, Optional<bool> verify, MemberFlags flags, string reason)
+	internal Task ModifyGuildMemberAsync(
+		ulong guildId,
+		ulong userId,
+		Optional<string> nick,
+		Optional<IEnumerable<ulong>> roleIds,
+		Optional<bool> mute,
+		Optional<bool> deaf,
+		Optional<ulong?> voiceChannelId,
+		Optional<bool> verify,
+		MemberFlags flags,
+		string reason
+	)
 	{
 		var headers = Utilities.GetBaseHeaders();
 		if (!string.IsNullOrWhiteSpace(reason))
@@ -3276,17 +3637,20 @@ internal Task ModifyGuildMemberAsync(ulong guildId, ulong userId, Optional<strin
 			Mute = mute,
 			VoiceChannelId = voiceChannelId,
 			Flags = verify.HasValue && verify.Value
-			? flags | MemberFlags.BypassesVerification
-			: verify.HasValue && !verify.Value
-			? flags & ~MemberFlags.BypassesVerification
-			: Optional.None
+				? flags | MemberFlags.BypassesVerification
+				: verify.HasValue && !verify.Value
+					? flags & ~MemberFlags.BypassesVerification
+					: Optional.None
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
-		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, payload: DiscordJson.SerializeObject(pld));
+		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 	}
 
 	/// <summary>
@@ -3308,10 +3672,13 @@ internal Task ModifyTimeoutAsync(ulong guildId, ulong userId, DateTimeOffset? un
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
-		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, payload: DiscordJson.SerializeObject(pld));
+		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 	}
 
 	/// <summary>
@@ -3332,28 +3699,39 @@ internal Task ModifyCurrentMemberNicknameAsync(ulong guildId, string nick, strin
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}{Endpoints.ME}{Endpoints.NICK}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
-		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, payload: DiscordJson.SerializeObject(pld));
+		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 	}
-	#endregion
 
-	#region Roles
+#endregion
+
+#region Roles
+
 	/// <summary>
 	/// Gets the guild roles async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<IReadOnlyList<DiscordRole>> GetGuildRolesAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ROLES}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-		var roles = DiscordJson.DeserializeIEnumerableObject<IEnumerable<DiscordRole>>(res.Response, this.Discord).Select(xr => { xr.GuildId = guildId; return xr; }).ToList();
+		var roles = DiscordJson.DeserializeIEnumerableObject<IEnumerable<DiscordRole>>(res.Response, this.Discord).Select(xr =>
+		{
+			xr.GuildId = guildId;
+			return xr;
+		}).ToList();
 
 		return roles;
 	}
@@ -3379,14 +3757,15 @@ internal async Task<DiscordRole> ModifyGuildRoleAsync(ulong guildId, ulong roleI
 			Permissions = permissions & PermissionMethods.FullPerms,
 			Color = color,
 			Hoist = hoist,
-			Mentionable = mentionable,
+			Mentionable = mentionable
 		};
 
 		if (emoji.HasValue && iconb64.HasValue)
 		{
 			pld.IconBase64 = null;
 			pld.UnicodeEmoji = emoji;
-		} else if (emoji.HasValue && !iconb64.HasValue)
+		}
+		else if (emoji.HasValue && !iconb64.HasValue)
 			pld.UnicodeEmoji = emoji;
 		else if (iconb64.HasValue && !emoji.HasValue)
 			pld.IconBase64 = iconb64;
@@ -3396,7 +3775,10 @@ internal async Task<DiscordRole> ModifyGuildRoleAsync(ulong guildId, ulong roleI
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ROLES}/:role_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, role_id = roleId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId, role_id = roleId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -3420,7 +3802,10 @@ internal Task DeleteRoleAsync(ulong guildId, ulong roleId, string reason)
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ROLES}/:role_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, role_id = roleId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId, role_id = roleId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
@@ -3452,7 +3837,10 @@ internal async Task<DiscordRole> CreateGuildRoleAsync(ulong guildId, string name
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ROLES}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -3462,16 +3850,17 @@ internal async Task<DiscordRole> CreateGuildRoleAsync(ulong guildId, string name
 
 		return ret;
 	}
-	#endregion
 
-	#region Prune
+#endregion
+
+#region Prune
+
 	/// <summary>
 	/// Gets the guild prune count async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="days">The days.</param>
 	/// <param name="includeRoles">The include_roles.</param>
-
 	internal async Task<int> GetGuildPruneCountAsync(ulong guildId, int days, IEnumerable<ulong> includeRoles)
 	{
 		if (days < 0 || days > 30)
@@ -3483,11 +3872,14 @@ internal async Task<int> GetGuildPruneCountAsync(ulong guildId, int days, IEnume
 		};
 
 		var sb = includeRoles?.Aggregate(new StringBuilder(),
-					 (sb, id) => sb.Append($"&include_roles={id}"))
-				 ?? new StringBuilder();
+			         (sb, id) => sb.Append($"&include_roles={id}"))
+		         ?? new StringBuilder();
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.PRUNE}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 		var url = Utilities.GetApiUriFor(path, $"{BuildQueryString(urlParams)}{sb}", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
@@ -3504,7 +3896,6 @@ internal async Task<int> GetGuildPruneCountAsync(ulong guildId, int days, IEnume
 	/// <param name="computePruneCount">If true, compute_prune_count.</param>
 	/// <param name="includeRoles">The include_roles.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal async Task<int?> BeginGuildPruneAsync(ulong guildId, int days, bool computePruneCount, IEnumerable<ulong> includeRoles, string reason)
 	{
 		if (days < 0 || days > 30)
@@ -3512,20 +3903,22 @@ internal async Task<int> GetGuildPruneCountAsync(ulong guildId, int days, IEnume
 
 		var urlParams = new Dictionary<string, string>
 		{
-			["days"] = days.ToString(CultureInfo.InvariantCulture),
-			["compute_prune_count"] = computePruneCount.ToString()
+			["days"] = days.ToString(CultureInfo.InvariantCulture), ["compute_prune_count"] = computePruneCount.ToString()
 		};
 
 		var sb = includeRoles?.Aggregate(new StringBuilder(),
-					 (sb, id) => sb.Append($"&include_roles={id}"))
-				 ?? new StringBuilder();
+			         (sb, id) => sb.Append($"&include_roles={id}"))
+		         ?? new StringBuilder();
 
 		var headers = Utilities.GetBaseHeaders();
 		if (!string.IsNullOrWhiteSpace(reason))
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.PRUNE}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, $"{BuildQueryString(urlParams)}{sb}", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers).ConfigureAwait(false);
@@ -3534,18 +3927,22 @@ internal async Task<int> GetGuildPruneCountAsync(ulong guildId, int days, IEnume
 
 		return pruned.Pruned;
 	}
-	#endregion
 
-	#region GuildVarious
+#endregion
+
+#region GuildVarious
+
 	/// <summary>
 	/// Gets the template async.
 	/// </summary>
 	/// <param name="code">The code.</param>
-
 	internal async Task<DiscordGuildTemplate> GetTemplateAsync(string code)
 	{
 		var route = $"{Endpoints.GUILDS}{Endpoints.TEMPLATES}/:code";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { code }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			code
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3559,11 +3956,13 @@ internal async Task<DiscordGuildTemplate> GetTemplateAsync(string code)
 	/// Gets the guild integrations async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<IReadOnlyList<DiscordIntegration>> GetGuildIntegrationsAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INTEGRATIONS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3576,11 +3975,13 @@ internal async Task<IReadOnlyList<DiscordIntegration>> GetGuildIntegrationsAsync
 	/// Gets the guild preview async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<DiscordGuildPreview> GetGuildPreviewAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.PREVIEW}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3595,17 +3996,18 @@ internal async Task<DiscordGuildPreview> GetGuildPreviewAsync(ulong guildId)
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="type">The type.</param>
 	/// <param name="id">The id.</param>
-
 	internal async Task<DiscordIntegration> CreateGuildIntegrationAsync(ulong guildId, string type, ulong id)
 	{
 		var pld = new RestGuildIntegrationAttachPayload
 		{
-			Type = type,
-			Id = id
+			Type = type, Id = id
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INTEGRATIONS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -3622,18 +4024,18 @@ internal async Task<DiscordIntegration> CreateGuildIntegrationAsync(ulong guildI
 	/// <param name="expireBehaviour">The expire_behaviour.</param>
 	/// <param name="expireGracePeriod">The expire_grace_period.</param>
 	/// <param name="enableEmoticons">If true, enable_emoticons.</param>
-
 	internal async Task<DiscordIntegration> ModifyGuildIntegrationAsync(ulong guildId, ulong integrationId, int expireBehaviour, int expireGracePeriod, bool enableEmoticons)
 	{
 		var pld = new RestGuildIntegrationModifyPayload
 		{
-			ExpireBehavior = expireBehaviour,
-			ExpireGracePeriod = expireGracePeriod,
-			EnableEmoticons = enableEmoticons
+			ExpireBehavior = expireBehaviour, ExpireGracePeriod = expireGracePeriod, EnableEmoticons = enableEmoticons
 		};
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INTEGRATIONS}/:integration_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, integration_id = integrationId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId, integration_id = integrationId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -3647,11 +4049,13 @@ internal async Task<DiscordIntegration> ModifyGuildIntegrationAsync(ulong guildI
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="integration">The integration.</param>
-
 	internal Task DeleteGuildIntegrationAsync(ulong guildId, DiscordIntegration integration)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INTEGRATIONS}/:integration_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, integration_id = integration.Id }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId, integration_id = integration.Id
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, payload: DiscordJson.SerializeObject(integration));
@@ -3662,11 +4066,13 @@ internal Task DeleteGuildIntegrationAsync(ulong guildId, DiscordIntegration inte
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="integrationId">The integration_id.</param>
-
 	internal Task SyncGuildIntegrationAsync(ulong guildId, ulong integrationId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INTEGRATIONS}/:integration_id{Endpoints.SYNC}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId, integration_id = integrationId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId, integration_id = integrationId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route);
@@ -3676,11 +4082,13 @@ internal Task SyncGuildIntegrationAsync(ulong guildId, ulong integrationId)
 	/// Gets the guild voice regions async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<IReadOnlyList<DiscordVoiceRegion>> GetGuildVoiceRegionsAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.REGIONS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3694,11 +4102,13 @@ internal async Task<IReadOnlyList<DiscordVoiceRegion>> GetGuildVoiceRegionsAsync
 	/// Gets the guild invites async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<IReadOnlyList<DiscordInvite>> GetGuildInvitesAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INVITES}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3707,9 +4117,11 @@ internal async Task<IReadOnlyList<DiscordInvite>> GetGuildInvitesAsync(ulong gui
 
 		return invites;
 	}
-	#endregion
 
-	#region Invite
+#endregion
+
+#region Invite
+
 	/// <summary>
 	/// Gets the invite async.
 	/// </summary>
@@ -3717,7 +4129,6 @@ internal async Task<IReadOnlyList<DiscordInvite>> GetGuildInvitesAsync(ulong gui
 	/// <param name="withCounts">If true, with_counts.</param>
 	/// <param name="withExpiration">If true, with_expiration.</param>
 	/// <param name="guildScheduledEventId">The scheduled event id to get.</param>
-
 	internal async Task<DiscordInvite> GetInviteAsync(string inviteCode, bool? withCounts, bool? withExpiration, ulong? guildScheduledEventId)
 	{
 		var urlParams = new Dictionary<string, string>();
@@ -3729,7 +4140,10 @@ internal async Task<DiscordInvite> GetInviteAsync(string inviteCode, bool? withC
 			urlParams["guild_scheduled_event_id"] = guildScheduledEventId?.ToString();
 
 		var route = $"{Endpoints.INVITES}/:invite_code";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {invite_code = inviteCode }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			invite_code = inviteCode
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3743,7 +4157,6 @@ internal async Task<DiscordInvite> GetInviteAsync(string inviteCode, bool? withC
 	/// </summary>
 	/// <param name="inviteCode">The invite_code.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal async Task<DiscordInvite> DeleteInviteAsync(string inviteCode, string reason)
 	{
 		var headers = Utilities.GetBaseHeaders();
@@ -3751,7 +4164,10 @@ internal async Task<DiscordInvite> DeleteInviteAsync(string inviteCode, string r
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.INVITES}/:invite_code";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {invite_code = inviteCode }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			invite_code = inviteCode
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers).ConfigureAwait(false);
@@ -3761,32 +4177,35 @@ internal async Task<DiscordInvite> DeleteInviteAsync(string inviteCode, string r
 	}
 
 	/*
-         * Disabled due to API restrictions
-         *
-         * internal async Task<DiscordInvite> InternalAcceptInvite(string invite_code)
-         * {
-         *     this.Discord.DebugLogger.LogMessage(LogLevel.Warning, "REST API", "Invite accept endpoint was used; this account is now likely unverified", DateTime.Now);
-         *
-         *     var url = new Uri($"{Utils.GetApiBaseUri(this.Configuration), Endpoints.INVITES}/{invite_code));
-         *     var bucket = this.Rest.GetBucket(0, MajorParameterType.Unbucketed, url, HttpRequestMethod.POST);
-         *     var res = await this.DoRequestAsync(this.Discord, bucket, url, HttpRequestMethod.POST).ConfigureAwait(false);
-         *
-         *     var ret = DiscordJson.DeserializeObject<DiscordInvite>(res.Response, this.Discord);
-         *     ret.Discord = this.Discord;
-         *
-         *     return ret;
-         * }
-         */
-	#endregion
-
-	#region Connections
+	 * Disabled due to API restrictions
+	 *
+	 * internal async Task<DiscordInvite> InternalAcceptInvite(string invite_code)
+	 * {
+	 *     this.Discord.DebugLogger.LogMessage(LogLevel.Warning, "REST API", "Invite accept endpoint was used; this account is now likely unverified", DateTime.Now);
+	 *
+	 *     var url = new Uri($"{Utils.GetApiBaseUri(this.Configuration), Endpoints.INVITES}/{invite_code));
+	 *     var bucket = this.Rest.GetBucket(0, MajorParameterType.Unbucketed, url, HttpRequestMethod.POST);
+	 *     var res = await this.DoRequestAsync(this.Discord, bucket, url, HttpRequestMethod.POST).ConfigureAwait(false);
+	 *
+	 *     var ret = DiscordJson.DeserializeObject<DiscordInvite>(res.Response, this.Discord);
+	 *     ret.Discord = this.Discord;
+	 *
+	 *     return ret;
+	 * }
+	 */
+
+#endregion
+
+#region Connections
+
 	/// <summary>
 	/// Gets the users connections async.
 	/// </summary>
 	internal async Task<IReadOnlyList<DiscordConnection>> GetUserConnectionsAsync()
 	{
 		var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CONNECTIONS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3803,7 +4222,10 @@ internal async Task<IReadOnlyList<DiscordConnection>> GetUserConnectionsAsync()
 	internal async Task<IReadOnlyList<DiscordApplicationRoleConnectionMetadata>> GetRoleConnectionMetadataRecords(ulong id)
 	{
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.ROLE_CONNECTIONS}{Endpoints.METADATA}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { application_id = id }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			application_id = id
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3822,7 +4244,6 @@ internal async Task<IReadOnlyList<DiscordApplicationRoleConnectionMetadata>> Upd
 	{
 		var pld = new List<RestApplicationRoleConnectionMetadataPayload>();
 		foreach (var metadataObject in metadataObjects)
-		{
 			pld.Add(new()
 			{
 				Type = metadataObject.Type,
@@ -3832,27 +4253,31 @@ internal async Task<IReadOnlyList<DiscordApplicationRoleConnectionMetadata>> Upd
 				NameLocalizations = metadataObject.NameLocalizations?.GetKeyValuePairs(),
 				DescriptionLocalizations = metadataObject.DescriptionLocalizations?.GetKeyValuePairs()
 			});
-		}
 
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.ROLE_CONNECTIONS}{Endpoints.METADATA}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new { application_id = id }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			application_id = id
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 		var metadata = DiscordJson.DeserializeIEnumerableObject<List<DiscordApplicationRoleConnectionMetadata>>(res.Response, this.Discord);
 		return metadata;
 	}
-	#endregion
 
-	#region Voice
+#endregion
+
+#region Voice
+
 	/// <summary>
 	/// Lists the voice regions async.
 	/// </summary>
-
 	internal async Task<IReadOnlyList<DiscordVoiceRegion>> ListVoiceRegionsAsync()
 	{
 		var route = $"{Endpoints.VOICE}{Endpoints.REGIONS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3861,9 +4286,11 @@ internal async Task<IReadOnlyList<DiscordVoiceRegion>> ListVoiceRegionsAsync()
 
 		return regions;
 	}
-	#endregion
 
-	#region Webhooks
+#endregion
+
+#region Webhooks
+
 	/// <summary>
 	/// Creates the webhook async.
 	/// </summary>
@@ -3875,9 +4302,7 @@ internal async Task<DiscordWebhook> CreateWebhookAsync(ulong channelId, string n
 	{
 		var pld = new RestWebhookPayload
 		{
-			Name = name,
-			AvatarBase64 = base64Avatar.ValueOrDefault(),
-			AvatarSet = base64Avatar.HasValue
+			Name = name, AvatarBase64 = base64Avatar.ValueOrDefault(), AvatarSet = base64Avatar.HasValue
 		};
 
 		var headers = new Dictionary<string, string>();
@@ -3885,7 +4310,10 @@ internal async Task<DiscordWebhook> CreateWebhookAsync(ulong channelId, string n
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.WEBHOOKS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -3903,12 +4331,19 @@ internal async Task<DiscordWebhook> CreateWebhookAsync(ulong channelId, string n
 	internal async Task<IReadOnlyList<DiscordWebhook>> GetChannelWebhooksAsync(ulong channelId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.WEBHOOKS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-		var webhooksRaw = DiscordJson.DeserializeIEnumerableObject<List<DiscordWebhook>>(res.Response, this.Discord).Select(xw => { xw.ApiClient = this; return xw; });
+		var webhooksRaw = DiscordJson.DeserializeIEnumerableObject<List<DiscordWebhook>>(res.Response, this.Discord).Select(xw =>
+		{
+			xw.ApiClient = this;
+			return xw;
+		});
 		return webhooksRaw.ToList();
 	}
 
@@ -3919,12 +4354,19 @@ internal async Task<IReadOnlyList<DiscordWebhook>> GetChannelWebhooksAsync(ulong
 	internal async Task<IReadOnlyList<DiscordWebhook>> GetGuildWebhooksAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WEBHOOKS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-		var webhooksRaw = DiscordJson.DeserializeIEnumerableObject<List<DiscordWebhook>>(res.Response, this.Discord).Select(xw => { xw.ApiClient = this; return xw; });
+		var webhooksRaw = DiscordJson.DeserializeIEnumerableObject<List<DiscordWebhook>>(res.Response, this.Discord).Select(xw =>
+		{
+			xw.ApiClient = this;
+			return xw;
+		});
 		return webhooksRaw.ToList();
 	}
 
@@ -3935,7 +4377,10 @@ internal async Task<IReadOnlyList<DiscordWebhook>> GetGuildWebhooksAsync(ulong g
 	internal async Task<DiscordWebhook> GetWebhookAsync(ulong webhookId)
 	{
 		var route = $"{Endpoints.WEBHOOKS}/:webhook_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { webhook_id = webhookId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			webhook_id = webhookId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord?.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3954,7 +4399,10 @@ internal async Task<DiscordWebhook> GetWebhookAsync(ulong webhookId)
 	internal async Task<DiscordWebhook> GetWebhookWithTokenAsync(ulong webhookId, string webhookToken)
 	{
 		var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			webhook_id = webhookId, webhook_token = webhookToken
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord?.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -3979,10 +4427,7 @@ internal async Task<DiscordWebhook> ModifyWebhookAsync(ulong webhookId, ulong ch
 	{
 		var pld = new RestWebhookPayload
 		{
-			Name = name,
-			AvatarBase64 = base64Avatar.ValueOrDefault(),
-			AvatarSet = base64Avatar.HasValue,
-			ChannelId = channelId
+			Name = name, AvatarBase64 = base64Avatar.ValueOrDefault(), AvatarSet = base64Avatar.HasValue, ChannelId = channelId
 		};
 
 		var headers = new Dictionary<string, string>();
@@ -3990,7 +4435,10 @@ internal async Task<DiscordWebhook> ModifyWebhookAsync(ulong webhookId, ulong ch
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.WEBHOOKS}/:webhook_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {webhook_id = webhookId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			webhook_id = webhookId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -4013,8 +4461,7 @@ internal async Task<DiscordWebhook> ModifyWebhookAsync(ulong webhookId, string n
 	{
 		var pld = new RestWebhookPayload
 		{
-			Name = name,
-			AvatarBase64 = base64Avatar
+			Name = name, AvatarBase64 = base64Avatar
 		};
 
 		var headers = new Dictionary<string, string>();
@@ -4022,7 +4469,10 @@ internal async Task<DiscordWebhook> ModifyWebhookAsync(ulong webhookId, string n
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			webhook_id = webhookId, webhook_token = webhookToken
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -4045,7 +4495,10 @@ internal Task DeleteWebhookAsync(ulong webhookId, string reason)
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.WEBHOOKS}/:webhook_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {webhook_id = webhookId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			webhook_id = webhookId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
@@ -4064,7 +4517,10 @@ internal Task DeleteWebhookAsync(ulong webhookId, string webhookToken, string re
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			webhook_id = webhookId, webhook_token = webhookToken
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
@@ -4126,6 +4582,7 @@ internal async Task<DiscordMessage> ExecuteWebhookAsync(ulong webhookId, string
 				attachments.Add(att);
 				fileId++;
 			}
+
 			pld.Attachments = attachments;
 		}
 
@@ -4133,7 +4590,10 @@ internal async Task<DiscordMessage> ExecuteWebhookAsync(ulong webhookId, string
 			values["payload_json"] = DiscordJson.SerializeObject(pld);
 
 		var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			webhook_id = webhookId, webhook_token = webhookToken
+		}, out var path);
 
 		var qub = Utilities.GetApiUriBuilderFor(path, this.Discord?.Configuration).AddParameter("wait", "true");
 		if (threadId != null)
@@ -4163,7 +4623,10 @@ internal async Task<DiscordMessage> ExecuteWebhookAsync(ulong webhookId, string
 	internal async Task<DiscordMessage> ExecuteWebhookSlackAsync(ulong webhookId, string webhookToken, string jsonPayload, string threadId)
 	{
 		var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.SLACK}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			webhook_id = webhookId, webhook_token = webhookToken
+		}, out var path);
 
 		var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "true");
 		if (threadId != null)
@@ -4184,7 +4647,10 @@ internal async Task<DiscordMessage> ExecuteWebhookSlackAsync(ulong webhookId, st
 	internal async Task<DiscordMessage> ExecuteWebhookGithubAsync(ulong webhookId, string webhookToken, string jsonPayload, string threadId)
 	{
 		var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.GITHUB}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			webhook_id = webhookId, webhook_token = webhookToken
+		}, out var path);
 
 		var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "true");
 		if (threadId != null)
@@ -4239,6 +4705,7 @@ internal async Task<DiscordMessage> EditWebhookMessageAsync(ulong webhookId, str
 				attachments.Add(att);
 				fileId++;
 			}
+
 			if (builder.Attachments != null && builder.Attachments?.Count > 0)
 				attachments.AddRange(builder.Attachments);
 
@@ -4249,7 +4716,10 @@ internal async Task<DiscordMessage> EditWebhookMessageAsync(ulong webhookId, str
 				["payload_json"] = DiscordJson.SerializeObject(pld)
 			};
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.MESSAGES}/:message_id";
-			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId }, out var path);
+			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+			{
+				webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId
+			}, out var path);
 
 			var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration);
 			if (threadId != null)
@@ -4273,7 +4743,10 @@ internal async Task<DiscordMessage> EditWebhookMessageAsync(ulong webhookId, str
 			pld.Attachments = builder.Attachments;
 
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.MESSAGES}/:message_id";
-			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId }, out var path);
+			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+			{
+				webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId
+			}, out var path);
 
 			var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration);
 			if (threadId != null)
@@ -4312,7 +4785,10 @@ internal Task<DiscordMessage> EditWebhookMessageAsync(ulong webhookId, string we
 	internal async Task<DiscordMessage> GetWebhookMessageAsync(ulong webhookId, string webhookToken, string messageId, string threadId)
 	{
 		var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.MESSAGES}/:message_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId
+		}, out var path);
 
 		var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration);
 		if (threadId != null)
@@ -4353,7 +4829,10 @@ internal Task<DiscordMessage> GetWebhookMessageAsync(ulong webhookId, string web
 	internal async Task DeleteWebhookMessageAsync(ulong webhookId, string webhookToken, string messageId, string threadId)
 	{
 		var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.MESSAGES}/:message_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId
+		}, out var path);
 
 		var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration);
 		if (threadId != null)
@@ -4380,20 +4859,24 @@ internal Task DeleteWebhookMessageAsync(ulong webhookId, string webhookToken, ul
 	/// <param name="threadId">The thread_id.</param>
 	internal Task DeleteWebhookMessageAsync(ulong webhookId, string webhookToken, ulong messageId, ulong threadId) =>
 		this.DeleteWebhookMessageAsync(webhookId, webhookToken, messageId.ToString(), threadId.ToString());
-	#endregion
 
-	#region Reactions
+#endregion
+
+#region Reactions
+
 	/// <summary>
 	/// Creates the reaction async.
 	/// </summary>
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="messageId">The message_id.</param>
 	/// <param name="emoji">The emoji.</param>
-
 	internal Task CreateReactionAsync(ulong channelId, ulong messageId, string emoji)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}/:emoji{Endpoints.ME}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId, message_id = messageId, emoji }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			channel_id = channelId, message_id = messageId, emoji
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, ratelimitWaitOverride: this.Discord.Configuration.UseRelativeRatelimit ? null : 0.26);
@@ -4405,11 +4888,13 @@ internal Task CreateReactionAsync(ulong channelId, ulong messageId, string emoji
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="messageId">The message_id.</param>
 	/// <param name="emoji">The emoji.</param>
-
 	internal Task DeleteOwnReactionAsync(ulong channelId, ulong messageId, string emoji)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}/:emoji{Endpoints.ME}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId, emoji }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId, message_id = messageId, emoji
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, ratelimitWaitOverride: this.Discord.Configuration.UseRelativeRatelimit ? null : 0.26);
@@ -4423,7 +4908,6 @@ internal Task DeleteOwnReactionAsync(ulong channelId, ulong messageId, string em
 	/// <param name="userId">The user_id.</param>
 	/// <param name="emoji">The emoji.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task DeleteUserReactionAsync(ulong channelId, ulong messageId, ulong userId, string emoji, string reason)
 	{
 		var headers = new Dictionary<string, string>();
@@ -4431,7 +4915,10 @@ internal Task DeleteUserReactionAsync(ulong channelId, ulong messageId, ulong us
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}/:emoji/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId, emoji, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId, message_id = messageId, emoji, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers, ratelimitWaitOverride: this.Discord.Configuration.UseRelativeRatelimit ? null : 0.26);
@@ -4445,7 +4932,6 @@ internal Task DeleteUserReactionAsync(ulong channelId, ulong messageId, ulong us
 	/// <param name="emoji">The emoji.</param>
 	/// <param name="afterId">The after_id.</param>
 	/// <param name="limit">The limit.</param>
-
 	internal async Task<IReadOnlyList<DiscordUser>> GetReactionsAsync(ulong channelId, ulong messageId, string emoji, ulong? afterId = null, int limit = 25)
 	{
 		var urlParams = new Dictionary<string, string>();
@@ -4455,7 +4941,10 @@ internal async Task<IReadOnlyList<DiscordUser>> GetReactionsAsync(ulong channelI
 		urlParams["limit"] = limit.ToString(CultureInfo.InvariantCulture);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}/:emoji";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId, message_id = messageId, emoji }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId, message_id = messageId, emoji
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, BuildQueryString(urlParams), this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -4464,7 +4953,10 @@ internal async Task<IReadOnlyList<DiscordUser>> GetReactionsAsync(ulong channelI
 		var reacters = new List<DiscordUser>();
 		foreach (var xr in reactersRaw)
 		{
-			var usr = new DiscordUser(xr) { Discord = this.Discord };
+			var usr = new DiscordUser(xr)
+			{
+				Discord = this.Discord
+			};
 			usr = this.Discord.UserCache.AddOrUpdate(xr.Id, usr, (id, old) =>
 			{
 				old.Username = usr.Username;
@@ -4486,7 +4978,6 @@ internal async Task<IReadOnlyList<DiscordUser>> GetReactionsAsync(ulong channelI
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="messageId">The message_id.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task DeleteAllReactionsAsync(ulong channelId, ulong messageId, string reason)
 	{
 		var headers = new Dictionary<string, string>();
@@ -4494,7 +4985,10 @@ internal Task DeleteAllReactionsAsync(ulong channelId, ulong messageId, string r
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId, message_id = messageId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers, ratelimitWaitOverride: this.Discord.Configuration.UseRelativeRatelimit ? null : 0.26);
@@ -4506,18 +5000,21 @@ internal Task DeleteAllReactionsAsync(ulong channelId, ulong messageId, string r
 	/// <param name="channelId">The channel_id.</param>
 	/// <param name="messageId">The message_id.</param>
 	/// <param name="emoji">The emoji.</param>
-
 	internal Task DeleteReactionsEmojiAsync(ulong channelId, ulong messageId, string emoji)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}/:emoji";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId, emoji }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId, message_id = messageId, emoji
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, ratelimitWaitOverride: this.Discord.Configuration.UseRelativeRatelimit ? null : 0.26);
 	}
-	#endregion
 
-	#region Threads
+#endregion
+
+#region Threads
 
 	/// <summary>
 	/// Creates the thread.
@@ -4532,20 +5029,26 @@ internal Task DeleteReactionsEmojiAsync(ulong channelId, ulong messageId, string
 	/// <param name="builder">The message builder.</param>
 	/// <param name="isForum">Whether this thread is in a forum.</param>
 	/// <param name="reason">The reason.</param>
-	internal async Task<DiscordThreadChannel> CreateThreadAsync(ulong channelId, ulong? messageId, string name,
-		ThreadAutoArchiveDuration? autoArchiveDuration, ChannelType? type, int? rateLimitPerUser, IEnumerable<ForumPostTag>? appliedTags = null,
-		DiscordMessageBuilder builder = null, bool isForum = false, string? reason = null)
+	internal async Task<DiscordThreadChannel> CreateThreadAsync(
+		ulong channelId,
+		ulong? messageId,
+		string name,
+		ThreadAutoArchiveDuration? autoArchiveDuration,
+		ChannelType? type,
+		int? rateLimitPerUser,
+		IEnumerable<ForumPostTag>? appliedTags = null,
+		DiscordMessageBuilder builder = null,
+		bool isForum = false,
+		string? reason = null
+	)
 	{
 		var pld = new RestThreadChannelCreatePayload
 		{
-			Name = name,
-			AutoArchiveDuration = autoArchiveDuration,
-			PerUserRateLimit = rateLimitPerUser
+			Name = name, AutoArchiveDuration = autoArchiveDuration, PerUserRateLimit = rateLimitPerUser
 		};
 
 		if (isForum)
 		{
-
 			pld.Message = new()
 			{
 				Content = builder.Content,
@@ -4555,10 +5058,12 @@ internal async Task<DiscordThreadChannel> CreateThreadAsync(ulong channelId, ulo
 				Embeds = builder.Embeds,
 				//Flags = builder.Flags,
 				//Mentions = builder.Mentions,
-				StickersIds = builder.Sticker != null ? new List<ulong>(1)
-				{
-					builder.Sticker.Id
-				} : null
+				StickersIds = builder.Sticker != null
+					? new List<ulong>(1)
+					{
+						builder.Sticker.Id
+					}
+					: null
 			};
 			if (appliedTags != null && appliedTags.Any())
 			{
@@ -4572,11 +5077,7 @@ internal async Task<DiscordThreadChannel> CreateThreadAsync(ulong channelId, ulo
 			}
 		}
 		else
-		{
 			pld.Type = type;
-		}
-
-
 
 		var headers = Utilities.GetBaseHeaders();
 		if (!string.IsNullOrWhiteSpace(reason))
@@ -4588,8 +5089,14 @@ internal async Task<DiscordThreadChannel> CreateThreadAsync(ulong channelId, ulo
 		route += Endpoints.THREADS;
 
 		object param = messageId is null
-			? new {channel_id = channelId}
-			: new {channel_id = channelId, message_id = messageId};
+			? new
+			{
+				channel_id = channelId
+			}
+			: new
+			{
+				channel_id = channelId, message_id = messageId
+			};
 
 		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, param, out var path);
 
@@ -4607,7 +5114,10 @@ internal async Task<DiscordThreadChannel> CreateThreadAsync(ulong channelId, ulo
 	internal async Task<DiscordThreadChannel> GetThreadAsync(ulong threadId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:thread_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {thread_id = threadId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			thread_id = threadId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -4623,7 +5133,10 @@ internal async Task<DiscordThreadChannel> GetThreadAsync(ulong threadId)
 	internal async Task JoinThreadAsync(ulong channelId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREAD_MEMBERS}{Endpoints.ME}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route).ConfigureAwait(false);
@@ -4636,7 +5149,10 @@ internal async Task JoinThreadAsync(ulong channelId)
 	internal async Task LeaveThreadAsync(ulong channelId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREAD_MEMBERS}{Endpoints.ME}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route).ConfigureAwait(false);
@@ -4650,7 +5166,10 @@ internal async Task LeaveThreadAsync(ulong channelId)
 	internal async Task AddThreadMemberAsync(ulong channelId, ulong userId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREAD_MEMBERS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			channel_id = channelId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route).ConfigureAwait(false);
@@ -4670,7 +5189,10 @@ internal async Task<DiscordThreadChannelMember> GetThreadMemberAsync(ulong chann
 		};
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREAD_MEMBERS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -4688,7 +5210,10 @@ internal async Task<DiscordThreadChannelMember> GetThreadMemberAsync(ulong chann
 	internal async Task RemoveThreadMemberAsync(ulong channelId, ulong userId)
 	{
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREAD_MEMBERS}/:user_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, user_id = userId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			channel_id = channelId, user_id = userId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route).ConfigureAwait(false);
@@ -4716,7 +5241,10 @@ internal async Task<IReadOnlyList<DiscordThreadChannelMember>> GetThreadMembersA
 			urlParams["limit"] = limit.Value.ToString(CultureInfo.InvariantCulture);
 
 		var route = $"{Endpoints.CHANNELS}/:thread_id{Endpoints.THREAD_MEMBERS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {thread_id = threadId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			thread_id = threadId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -4733,7 +5261,10 @@ internal async Task<IReadOnlyList<DiscordThreadChannelMember>> GetThreadMembersA
 	internal async Task<DiscordThreadResult> GetActiveThreadsAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.THREADS}{Endpoints.THREAD_ACTIVE}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -4759,7 +5290,10 @@ internal async Task<DiscordThreadResult> GetJoinedPrivateArchivedThreadsAsync(ul
 			urlParams["limit"] = limit.Value.ToString(CultureInfo.InvariantCulture);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.USERS}{Endpoints.ME}{Endpoints.THREADS}{Endpoints.THREAD_ARCHIVED}{Endpoints.THREAD_PRIVATE}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -4784,7 +5318,10 @@ internal async Task<DiscordThreadResult> GetPublicArchivedThreadsAsync(ulong cha
 			urlParams["limit"] = limit.Value.ToString(CultureInfo.InvariantCulture);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREADS}{Endpoints.THREAD_ARCHIVED}{Endpoints.THREAD_PUBLIC}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -4809,7 +5346,10 @@ internal async Task<DiscordThreadResult> GetPrivateArchivedThreadsAsync(ulong ch
 			urlParams["limit"] = limit.Value.ToString(CultureInfo.InvariantCulture);
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREADS}{Endpoints.THREAD_ARCHIVED}{Endpoints.THREAD_PRIVATE}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -4856,6 +5396,7 @@ internal Task ModifyThreadAsync(ulong threadId, ChannelType parentType, string n
 
 				pld.AppliedTags = tags;
 			}
+
 			if (pinned.HasValue && pinned.Value.HasValue)
 				pld.Flags = pinned.Value.Value ? ChannelFlags.Pinned : Optional.None;
 		}
@@ -4865,24 +5406,30 @@ internal Task ModifyThreadAsync(ulong threadId, ChannelType parentType, string n
 			headers.Add(REASON_HEADER_NAME, reason);
 
 		var route = $"{Endpoints.CHANNELS}/:thread_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {thread_id = threadId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			thread_id = threadId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 	}
 
-	#endregion
+#endregion
+
+#region Emoji
 
-	#region Emoji
 	/// <summary>
 	/// Gets the guild emojis async.
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
-
 	internal async Task<IReadOnlyList<DiscordGuildEmoji>> GetGuildEmojisAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.EMOJIS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -4920,11 +5467,13 @@ internal async Task<IReadOnlyList<DiscordGuildEmoji>> GetGuildEmojisAsync(ulong
 	/// </summary>
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="emojiId">The emoji_id.</param>
-
 	internal async Task<DiscordGuildEmoji> GetGuildEmojiAsync(ulong guildId, ulong emojiId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.EMOJIS}/:emoji_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, emoji_id = emojiId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId, emoji_id = emojiId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -4950,14 +5499,11 @@ internal async Task<DiscordGuildEmoji> GetGuildEmojiAsync(ulong guildId, ulong e
 	/// <param name="imageb64">The imageb64.</param>
 	/// <param name="roles">The roles.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal async Task<DiscordGuildEmoji> CreateGuildEmojiAsync(ulong guildId, string name, string imageb64, IEnumerable<ulong> roles, string reason)
 	{
 		var pld = new RestGuildEmojiCreatePayload
 		{
-			Name = name,
-			ImageB64 = imageb64,
-			Roles = roles?.ToArray()
+			Name = name, ImageB64 = imageb64, Roles = roles?.ToArray()
 		};
 
 		var headers = new Dictionary<string, string>();
@@ -4965,7 +5511,10 @@ internal async Task<DiscordGuildEmoji> CreateGuildEmojiAsync(ulong guildId, stri
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.EMOJIS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -4992,13 +5541,11 @@ internal async Task<DiscordGuildEmoji> CreateGuildEmojiAsync(ulong guildId, stri
 	/// <param name="name">The name.</param>
 	/// <param name="roles">The roles.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal async Task<DiscordGuildEmoji> ModifyGuildEmojiAsync(ulong guildId, ulong emojiId, string name, IEnumerable<ulong> roles, string reason)
 	{
 		var pld = new RestGuildEmojiModifyPayload
 		{
-			Name = name,
-			Roles = roles?.ToArray()
+			Name = name, Roles = roles?.ToArray()
 		};
 
 		var headers = new Dictionary<string, string>();
@@ -5006,7 +5553,10 @@ internal async Task<DiscordGuildEmoji> ModifyGuildEmojiAsync(ulong guildId, ulon
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.EMOJIS}/:emoji_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, emoji_id = emojiId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId, emoji_id = emojiId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -5030,7 +5580,6 @@ internal async Task<DiscordGuildEmoji> ModifyGuildEmojiAsync(ulong guildId, ulon
 	/// <param name="guildId">The guild_id.</param>
 	/// <param name="emojiId">The emoji_id.</param>
 	/// <param name="reason">The reason.</param>
-
 	internal Task DeleteGuildEmojiAsync(ulong guildId, ulong emojiId, string reason)
 	{
 		var headers = new Dictionary<string, string>();
@@ -5038,14 +5587,18 @@ internal Task DeleteGuildEmojiAsync(ulong guildId, ulong emojiId, string reason)
 			headers[REASON_HEADER_NAME] = reason;
 
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.EMOJIS}/:emoji_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, emoji_id = emojiId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId, emoji_id = emojiId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 	}
-	#endregion
 
-	#region Stickers
+#endregion
+
+#region Stickers
 
 	/// <summary>
 	/// Gets a sticker.
@@ -5054,7 +5607,10 @@ internal Task DeleteGuildEmojiAsync(ulong guildId, ulong emojiId, string reason)
 	internal async Task<DiscordSticker> GetStickerAsync(ulong stickerId)
 	{
 		var route = $"{Endpoints.STICKERS}/:sticker_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {sticker_id = stickerId}, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			sticker_id = stickerId
+		}, out var path);
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -5068,7 +5624,8 @@ internal async Task<DiscordSticker> GetStickerAsync(ulong stickerId)
 	internal async Task<IReadOnlyList<DiscordStickerPack>> GetStickerPacksAsync()
 	{
 		var route = $"{Endpoints.STICKERPACKS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -5086,7 +5643,10 @@ internal async Task<IReadOnlyList<DiscordStickerPack>> GetStickerPacksAsync()
 	internal async Task<IReadOnlyList<DiscordSticker>> GetGuildStickersAsync(ulong guildId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.STICKERS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId}, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -5103,7 +5663,10 @@ internal async Task<IReadOnlyList<DiscordSticker>> GetGuildStickersAsync(ulong g
 	internal async Task<DiscordSticker> GetGuildStickerAsync(ulong guildId, ulong stickerId)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.STICKERS}/:sticker_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, sticker_id = stickerId}, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId, sticker_id = stickerId
+		}, out var path);
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -5124,7 +5687,10 @@ internal async Task<DiscordSticker> GetGuildStickerAsync(ulong guildId, ulong st
 	internal async Task<DiscordSticker> CreateGuildStickerAsync(ulong guildId, string name, string description, string tags, DiscordMessageFile file, string reason)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.STICKERS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId}, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			guild_id = guildId
+		}, out var path);
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 
 		var headers = Utilities.GetBaseHeaders();
@@ -5149,7 +5715,10 @@ internal async Task<DiscordSticker> CreateGuildStickerAsync(ulong guildId, strin
 	internal async Task<DiscordSticker> ModifyGuildStickerAsync(ulong guildId, ulong stickerId, Optional<string> name, Optional<string> description, Optional<string> tags, string reason)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.STICKERS}/:sticker_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, sticker_id = stickerId}, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			guild_id = guildId, sticker_id = stickerId
+		}, out var path);
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var headers = Utilities.GetBaseHeaders();
 		if (!string.IsNullOrWhiteSpace(reason))
@@ -5157,9 +5726,7 @@ internal async Task<DiscordSticker> ModifyGuildStickerAsync(ulong guildId, ulong
 
 		var pld = new RestStickerModifyPayload()
 		{
-			Name = name,
-			Description = description,
-			Tags = tags
+			Name = name, Description = description, Tags = tags
 		};
 
 		var values = new Dictionary<string, string>
@@ -5181,7 +5748,10 @@ internal async Task<DiscordSticker> ModifyGuildStickerAsync(ulong guildId, ulong
 	internal async Task DeleteGuildStickerAsync(ulong guildId, ulong stickerId, string reason)
 	{
 		var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.STICKERS}/:sticker_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, sticker_id = stickerId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			guild_id = guildId, sticker_id = stickerId
+		}, out var path);
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var headers = Utilities.GetBaseHeaders();
 		if (!string.IsNullOrWhiteSpace(reason))
@@ -5189,9 +5759,10 @@ internal async Task DeleteGuildStickerAsync(ulong guildId, ulong stickerId, stri
 
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers).ConfigureAwait(false);
 	}
-	#endregion
 
-	#region Application Commands
+#endregion
+
+#region Application Commands
 
 	/// <summary>
 	/// Gets the global application commands.
@@ -5201,7 +5772,10 @@ internal async Task DeleteGuildStickerAsync(ulong guildId, ulong stickerId, stri
 	internal async Task<IReadOnlyList<DiscordApplicationCommand>> GetGlobalApplicationCommandsAsync(ulong applicationId, bool withLocalizations = false)
 	{
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {application_id = applicationId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			application_id = applicationId
+		}, out var path);
 
 		var querydict = new Dictionary<string, string>
 		{
@@ -5224,7 +5798,6 @@ internal async Task<IReadOnlyList<DiscordApplicationCommand>> BulkOverwriteGloba
 		var pld = new List<RestApplicationCommandCreatePayload>();
 		if (commands.Any())
 			foreach (var command in commands)
-			{
 				pld.Add(new()
 				{
 					Type = command.Type,
@@ -5239,10 +5812,12 @@ internal async Task<IReadOnlyList<DiscordApplicationCommand>> BulkOverwriteGloba
 					AllowedContexts = command.AllowedContexts,
 					IntegrationTypes = command.IntegrationTypes
 				});
-			}
 
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {application_id = applicationId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			application_id = applicationId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -5274,7 +5849,10 @@ internal async Task<DiscordApplicationCommand> CreateGlobalApplicationCommandAsy
 		};
 
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {application_id = applicationId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			application_id = applicationId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -5293,7 +5871,10 @@ internal async Task<DiscordApplicationCommand> CreateGlobalApplicationCommandAsy
 	internal async Task<DiscordApplicationCommand> GetGlobalApplicationCommandAsync(ulong applicationId, ulong commandId)
 	{
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}/:command_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {application_id = applicationId, command_id = commandId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			application_id = applicationId, command_id = commandId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -5319,13 +5900,20 @@ internal async Task<DiscordApplicationCommand> GetGlobalApplicationCommandAsync(
 	/// <param name="isNsfw">Whether this command is marked as NSFW.</param>
 	/// <param name="allowedContexts">The allowed contexts.</param>
 	/// <param name="integrationTypes">The allowed integration types.</param>
-	internal async Task<DiscordApplicationCommand> EditGlobalApplicationCommandAsync(ulong applicationId,
+	internal async Task<DiscordApplicationCommand> EditGlobalApplicationCommandAsync(
+		ulong applicationId,
 		ulong commandId,
-		Optional<string> name, Optional<string> description, Optional<List<DiscordApplicationCommandOption>?> options,
+		Optional<string> name,
+		Optional<string> description,
+		Optional<List<DiscordApplicationCommandOption>?> options,
 		Optional<DiscordApplicationCommandLocalization> nameLocalization,
 		Optional<DiscordApplicationCommandLocalization> descriptionLocalization,
-		Optional<Permissions?> defaultMemberPermission, Optional<bool> dmPermission, Optional<bool> isNsfw,
-		Optional<List<ApplicationCommandContexts>?> allowedContexts, Optional<List<ApplicationCommandIntegrationTypes>?> integrationTypes)
+		Optional<Permissions?> defaultMemberPermission,
+		Optional<bool> dmPermission,
+		Optional<bool> isNsfw,
+		Optional<List<ApplicationCommandContexts>?> allowedContexts,
+		Optional<List<ApplicationCommandIntegrationTypes>?> integrationTypes
+	)
 	{
 		var pld = new RestApplicationCommandEditPayload
 		{
@@ -5342,7 +5930,10 @@ internal async Task<DiscordApplicationCommand> EditGlobalApplicationCommandAsync
 		};
 
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}/:command_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {application_id = applicationId, command_id = commandId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			application_id = applicationId, command_id = commandId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -5358,11 +5949,13 @@ internal async Task<DiscordApplicationCommand> EditGlobalApplicationCommandAsync
 	/// </summary>
 	/// <param name="applicationId">The application_id.</param>
 	/// <param name="commandId">The command_id.</param>
-
 	internal async Task DeleteGlobalApplicationCommandAsync(ulong applicationId, ulong commandId)
 	{
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}/:command_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {application_id = applicationId, command_id = commandId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			application_id = applicationId, command_id = commandId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route).ConfigureAwait(false);
@@ -5377,7 +5970,10 @@ internal async Task DeleteGlobalApplicationCommandAsync(ulong applicationId, ulo
 	internal async Task<IReadOnlyList<DiscordApplicationCommand>> GetGuildApplicationCommandsAsync(ulong applicationId, ulong guildId, bool withLocalizations = false)
 	{
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {application_id = applicationId, guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			application_id = applicationId, guild_id = guildId
+		}, out var path);
 
 		var querydict = new Dictionary<string, string>
 		{
@@ -5401,7 +5997,6 @@ internal async Task<IReadOnlyList<DiscordApplicationCommand>> BulkOverwriteGuild
 		var pld = new List<RestApplicationCommandCreatePayload>();
 		if (commands.Any())
 			foreach (var command in commands)
-			{
 				pld.Add(new()
 				{
 					Type = command.Type,
@@ -5415,10 +6010,12 @@ internal async Task<IReadOnlyList<DiscordApplicationCommand>> BulkOverwriteGuild
 					Nsfw = command.IsNsfw,
 					AllowedContexts = command.AllowedContexts
 				});
-			}
 
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {application_id = applicationId, guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			application_id = applicationId, guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -5450,7 +6047,10 @@ internal async Task<DiscordApplicationCommand> CreateGuildApplicationCommandAsyn
 		};
 
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {application_id = applicationId, guild_id = guildId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			application_id = applicationId, guild_id = guildId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -5470,7 +6070,10 @@ internal async Task<DiscordApplicationCommand> CreateGuildApplicationCommandAsyn
 	internal async Task<DiscordApplicationCommand> GetGuildApplicationCommandAsync(ulong applicationId, ulong guildId, ulong commandId)
 	{
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}/:command_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {application_id = applicationId, guild_id = guildId, command_id = commandId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			application_id = applicationId, guild_id = guildId, command_id = commandId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -5497,13 +6100,21 @@ internal async Task<DiscordApplicationCommand> GetGuildApplicationCommandAsync(u
 	/// <param name="isNsfw">Whether this command is marked as NSFW.</param>
 	/// <param name="allowedContexts">The allowed contexts.</param>
 	/// <param name="integrationTypes">The allowed integration types.</param>
-	internal async Task<DiscordApplicationCommand> EditGuildApplicationCommandAsync(ulong applicationId, ulong guildId,
+	internal async Task<DiscordApplicationCommand> EditGuildApplicationCommandAsync(
+		ulong applicationId,
+		ulong guildId,
 		ulong commandId,
-		Optional<string> name, Optional<string> description, Optional<List<DiscordApplicationCommandOption>?> options,
+		Optional<string> name,
+		Optional<string> description,
+		Optional<List<DiscordApplicationCommandOption>?> options,
 		Optional<DiscordApplicationCommandLocalization> nameLocalization,
 		Optional<DiscordApplicationCommandLocalization> descriptionLocalization,
-		Optional<Permissions?> defaultMemberPermission, Optional<bool> dmPermission, Optional<bool> isNsfw,
-		Optional<List<ApplicationCommandContexts>?> allowedContexts, Optional<List<ApplicationCommandIntegrationTypes>?> integrationTypes)
+		Optional<Permissions?> defaultMemberPermission,
+		Optional<bool> dmPermission,
+		Optional<bool> isNsfw,
+		Optional<List<ApplicationCommandContexts>?> allowedContexts,
+		Optional<List<ApplicationCommandIntegrationTypes>?> integrationTypes
+	)
 	{
 		var pld = new RestApplicationCommandEditPayload
 		{
@@ -5519,7 +6130,10 @@ internal async Task<DiscordApplicationCommand> EditGuildApplicationCommandAsync(
 		};
 
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}/:command_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {application_id = applicationId, guild_id = guildId, command_id = commandId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+		{
+			application_id = applicationId, guild_id = guildId, command_id = commandId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -5539,7 +6153,10 @@ internal async Task<DiscordApplicationCommand> EditGuildApplicationCommandAsync(
 	internal async Task DeleteGuildApplicationCommandAsync(ulong applicationId, ulong guildId, ulong commandId)
 	{
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}/:command_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {application_id = applicationId, guild_id = guildId, command_id = commandId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			application_id = applicationId, guild_id = guildId, command_id = commandId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route).ConfigureAwait(false);
@@ -5574,25 +6191,24 @@ internal async Task CreateInteractionResponseAsync(ulong interactionId, string i
 					flags |= MessageFlags.SuppressNotifications;
 			}
 
-			var data = builder != null ? new DiscordInteractionApplicationCommandCallbackData
-			{
-				Content = builder?.Content ?? null,
-				Embeds = builder?.Embeds ?? null,
-				IsTts = builder?.IsTts,
-				Mentions = builder?.Mentions ?? null,
-				Flags = flags,
-				Components = builder?.Components ?? null,
-				Choices = null
-			} : null;
-
+			var data = builder != null
+				? new DiscordInteractionApplicationCommandCallbackData
+				{
+					Content = builder?.Content ?? null,
+					Embeds = builder?.Embeds ?? null,
+					IsTts = builder?.IsTts,
+					Mentions = builder?.Mentions ?? null,
+					Flags = flags,
+					Components = builder?.Components ?? null,
+					Choices = null
+				}
+				: null;
 
 			pld = new()
 			{
-				Type = type,
-				Data = data
+				Type = type, Data = data
 			};
 
-
 			if (builder != null && builder.Files != null && builder.Files.Count > 0)
 			{
 				ulong fileId = 0;
@@ -5610,12 +6226,12 @@ internal async Task CreateInteractionResponseAsync(ulong interactionId, string i
 					attachments.Add(att);
 					fileId++;
 				}
+
 				pld.Attachments = attachments;
 				pld.Data.Attachments = attachments;
 			}
 		}
 		else
-		{
 			pld = new()
 			{
 				Type = type,
@@ -5632,7 +6248,6 @@ internal async Task CreateInteractionResponseAsync(ulong interactionId, string i
 				},
 				Attachments = null
 			};
-		}
 
 		var values = new Dictionary<string, string>();
 
@@ -5641,7 +6256,10 @@ internal async Task CreateInteractionResponseAsync(ulong interactionId, string i
 				values["payload_json"] = DiscordJson.SerializeObject(pld);
 
 		var route = $"{Endpoints.INTERACTIONS}/:interaction_id/:interaction_token{Endpoints.CALLBACK}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {interaction_id = interactionId, interaction_token = interactionToken }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			interaction_id = interactionId, interaction_token = interactionToken
+		}, out var path);
 
 		var url = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "false").Build();
 		if (builder != null)
@@ -5672,16 +6290,17 @@ internal async Task CreateInteractionModalResponseAsync(ulong interactionId, str
 			Type = type,
 			Data = new()
 			{
-				Title = builder.Title,
-				CustomId = builder.CustomId,
-				ModalComponents = builder.ModalComponents
+				Title = builder.Title, CustomId = builder.CustomId, ModalComponents = builder.ModalComponents
 			}
 		};
 
 		var values = new Dictionary<string, string>();
 
 		var route = $"{Endpoints.INTERACTIONS}/:interaction_id/:interaction_token{Endpoints.CALLBACK}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {interaction_id = interactionId, interaction_token = interactionToken }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			interaction_id = interactionId, interaction_token = interactionToken
+		}, out var path);
 
 		var url = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "true").Build();
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -5704,17 +6323,17 @@ internal async Task CreateInteractionIframeResponseAsync(ulong interactionId, st
 			Type = type,
 			Data = new()
 			{
-				Title = title,
-				CustomId = customId,
-				ModalSize = modalSize,
-				IframePath = iFramePath
+				Title = title, CustomId = customId, ModalSize = modalSize, IframePath = iFramePath
 			}
 		};
 
 		var values = new Dictionary<string, string>();
 
 		var route = $"{Endpoints.INTERACTIONS}/:interaction_id/:interaction_token{Endpoints.CALLBACK}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {interaction_id = interactionId, interaction_token = interactionToken }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			interaction_id = interactionId, interaction_token = interactionToken
+		}, out var path);
 
 		var url = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "true").Build();
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -5760,7 +6379,6 @@ internal async Task<DiscordMessage> CreateFollowupMessageAsync(ulong application
 				if (embed.Timestamp != null)
 					embed.Timestamp = embed.Timestamp.Value.ToUniversalTime();
 
-
 		MessageFlags? flags = builder != null && builder.FlagsChanged ? MessageFlags.None : null;
 		if (builder != null)
 		{
@@ -5782,7 +6400,6 @@ internal async Task<DiscordMessage> CreateFollowupMessageAsync(ulong application
 			Components = builder.Components
 		};
 
-
 		if (builder.Files != null && builder.Files.Count > 0)
 		{
 			ulong fileId = 0;
@@ -5800,6 +6417,7 @@ internal async Task<DiscordMessage> CreateFollowupMessageAsync(ulong application
 				attachments.Add(att);
 				fileId++;
 			}
+
 			pld.Attachments = attachments;
 		}
 
@@ -5810,21 +6428,20 @@ internal async Task<DiscordMessage> CreateFollowupMessageAsync(ulong application
 			values["payload_json"] = DiscordJson.SerializeObject(pld);
 
 		var route = $"{Endpoints.WEBHOOKS}/:application_id/:interaction_token";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {application_id = applicationId, interaction_token = interactionToken }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			application_id = applicationId, interaction_token = interactionToken
+		}, out var path);
 
 		var url = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "true").Build();
 		var res = await this.DoMultipartAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, values: values, files: builder.Files).ConfigureAwait(false);
 		var ret = DiscordJson.DeserializeObject<DiscordMessage>(res.Response, this.Discord);
 
 		foreach (var att in ret.AttachmentsInternal)
-		{
 			att.Discord = this.Discord;
-		}
 
 		foreach (var file in builder.Files.Where(x => x.ResetPositionTo.HasValue))
-		{
 			file.Stream.Position = file.ResetPositionTo.Value;
-		}
 
 		ret.Discord = this.Discord;
 		return ret;
@@ -5857,9 +6474,10 @@ internal Task<DiscordMessage> EditFollowupMessageAsync(ulong applicationId, stri
 	/// <param name="messageId">The message id.</param>
 	internal Task DeleteFollowupMessageAsync(ulong applicationId, string interactionToken, ulong messageId) =>
 		this.DeleteWebhookMessageAsync(applicationId, interactionToken, messageId);
-	#endregion
 
-	#region Misc
+#endregion
+
+#region Misc
 
 	/// <summary>
 	/// Gets the published store sku listings (premium application subscription).
@@ -5874,12 +6492,13 @@ internal async Task<IReadOnlyList<DiscordStoreSku>> GetPublishedListingsAsync(ul
 		};
 
 		var route = $"{Endpoints.STORE}{Endpoints.PUBLISHED_LISTINGS}{Endpoints.SKUS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-		var storeSkus =  DiscordJson.DeserializeIEnumerableObject<List<DiscordStoreSku>>(res.Response, this.Discord);
+		var storeSkus = DiscordJson.DeserializeIEnumerableObject<List<DiscordStoreSku>>(res.Response, this.Discord);
 		foreach (var storeSku in storeSkus)
 			storeSku.Sku.Discord = this.Discord;
 
@@ -5894,7 +6513,10 @@ internal async Task<IReadOnlyList<DiscordStoreSku>> GetPublishedListingsAsync(ul
 	internal async Task<IReadOnlyList<DiscordSku>> GetSkusAsync(ulong applicationId)
 	{
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.SKUS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { application_id = applicationId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			application_id = applicationId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -5918,7 +6540,10 @@ internal async Task<IReadOnlyList<DiscordEntitlement>> GetEntitlementsAsync(ulon
 			urlParams["user_id"] = userId.Value.ToString();
 
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.ENTITLEMENTS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { application_id = applicationId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			application_id = applicationId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -5938,13 +6563,14 @@ internal async Task<DiscordEntitlement> CreateTestEntitlementsAsync(ulong applic
 	{
 		TestEntitlementCreatePayload pld = new()
 		{
-			SkuId = skuId,
-			OwnerId = ownerId,
-			OwnerType = ownerType
+			SkuId = skuId, OwnerId = ownerId, OwnerType = ownerType
 		};
 
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.ENTITLEMENTS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { application_id = applicationId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			application_id = applicationId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -5960,7 +6586,10 @@ internal async Task<DiscordEntitlement> CreateTestEntitlementsAsync(ulong applic
 	internal async Task DeleteTestEntitlementsAsync(ulong applicationId, ulong entitlementId)
 	{
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.ENTITLEMENTS}/:entitlement_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new { application_id = applicationId, entitlement_id = entitlementId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new
+		{
+			application_id = applicationId, entitlement_id = entitlementId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route).ConfigureAwait(false);
@@ -5986,7 +6615,10 @@ internal Task<DiscordRpcApplication> GetApplicationRpcInfoAsync(ulong applicatio
 	private async Task<TransportApplication> GetApplicationOauth2InfoAsync(string applicationId)
 	{
 		var route = $"{Endpoints.OAUTH2}{Endpoints.APPLICATIONS}/:application_id";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { application_id = applicationId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			application_id = applicationId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -6002,7 +6634,8 @@ private async Task<TransportApplication> GetApplicationOauth2InfoAsync(string ap
 	internal async Task<TransportApplication> GetCurrentApplicationInfoAsync()
 	{
 		var route = $"{Endpoints.APPLICATIONS}{Endpoints.ME}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -6019,9 +6652,15 @@ internal async Task<TransportApplication> GetCurrentApplicationInfoAsync()
 	/// </summary>
 	internal async Task<TransportApplication> ModifyCurrentApplicationInfoAsync(
 		Optional<string> description,
-		Optional<string> interactionsEndpointUrl, Optional<string> roleConnectionsVerificationUrl, Optional<string?> customInstallUrl,
-		Optional<List<string>?> tags, Optional<string?> iconb64, Optional<string?> coverImageb64,
-		Optional<ApplicationFlags> flags, Optional<DiscordApplicationInstallParams?> installParams)
+		Optional<string> interactionsEndpointUrl,
+		Optional<string> roleConnectionsVerificationUrl,
+		Optional<string?> customInstallUrl,
+		Optional<List<string>?> tags,
+		Optional<string?> iconb64,
+		Optional<string?> coverImageb64,
+		Optional<ApplicationFlags> flags,
+		Optional<DiscordApplicationInstallParams?> installParams
+	)
 	{
 		var pld = new RestApplicationModifyPayload()
 		{
@@ -6034,11 +6673,11 @@ internal async Task<TransportApplication> ModifyCurrentApplicationInfoAsync(
 			ConverImageBase64 = coverImageb64,
 			Flags = flags,
 			InstallParams = installParams
-
 		};
 
 		var route = $"{Endpoints.APPLICATIONS}{Endpoints.ME}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -6056,7 +6695,10 @@ internal async Task<TransportApplication> ModifyCurrentApplicationInfoAsync(
 	private async Task<DiscordRpcApplication> GetApplicationRpcInfoAsync(string applicationId)
 	{
 		var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.RPC}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { application_id = applicationId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			application_id = applicationId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -6071,7 +6713,10 @@ private async Task<DiscordRpcApplication> GetApplicationRpcInfoAsync(string appl
 	internal async Task<IReadOnlyList<DiscordApplicationAsset>> GetApplicationAssetsAsync(DiscordApplication application)
 	{
 		var route = $"{Endpoints.OAUTH2}{Endpoints.APPLICATIONS}/:application_id{Endpoints.ASSETS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { application_id = application.Id }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			application_id = application.Id
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
@@ -6095,7 +6740,8 @@ internal async Task<GatewayInfo> GetGatewayInfoAsync()
 		var route = Endpoints.GATEWAY;
 		if (this.Discord.Configuration.TokenType == TokenType.Bot)
 			route += Endpoints.BOT;
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+			{ }, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route, headers).ConfigureAwait(false);
@@ -6116,7 +6762,10 @@ internal async Task<GcpAttachmentsResponse> RequestFileUploadAsync(ulong channel
 		};
 
 		var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.ATTACHMENTS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { channel_id = channelId }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+		{
+			channel_id = channelId
+		}, out var path);
 
 		var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 		var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
@@ -6133,9 +6782,9 @@ internal void UploadGcpFile(GcpAttachmentUploadInformation target, Stream file)
 		this.Rest.HttpClient.Send(request);
 	}
 
-	#endregion
+#endregion
 
-	#region OAuth2
+#region OAuth2
 
 	/// <summary>
 	/// Gets the current oauth2 authorization information.
@@ -6148,7 +6797,8 @@ internal async Task<DiscordAuthorizationInformation> GetCurrentOAuth2Authorizati
 
 		// ReSharper disable once HeuristicUnreachableCode
 		var route = $"{Endpoints.OAUTH2}/@me";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+			{ }, out var path);
 
 		var headers = Utilities.GetBaseHeaders();
 		headers.Add("Bearer", accessToken);
@@ -6172,7 +6822,10 @@ internal async Task<DiscordUser> GetCurrentUserAsync(string accessToken)
 		// ReSharper disable once HeuristicUnreachableCode
 		var route = $"{Endpoints.USERS}/@me";
 		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route,
-			new { application_id = this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture) }, out var path);
+			new
+			{
+				application_id = this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture)
+			}, out var path);
 
 		var headers = Utilities.GetBaseHeaders();
 		headers.Add("Bearer", accessToken);
@@ -6195,7 +6848,8 @@ internal async Task<IReadOnlyList<DiscordConnection>> GetCurrentUserConnectionsA
 
 		// ReSharper disable once HeuristicUnreachableCode
 		var route = $"{Endpoints.USERS}/@me{Endpoints.CONNECTIONS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+			{ }, out var path);
 
 		var headers = Utilities.GetBaseHeaders();
 		headers.Add("Bearer", accessToken);
@@ -6217,7 +6871,8 @@ internal async Task<IReadOnlyList<DiscordGuild>> GetCurrentUserGuildsAsync(strin
 
 		// ReSharper disable once HeuristicUnreachableCode
 		var route = $"{Endpoints.USERS}/@me{Endpoints.GUILDS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+			{ }, out var path);
 
 		var headers = Utilities.GetBaseHeaders();
 		headers.Add("Bearer", accessToken);
@@ -6240,7 +6895,10 @@ internal async Task<DiscordMember> GetCurrentUserGuildMemberAsync(string accessT
 
 		// ReSharper disable once HeuristicUnreachableCode
 		var route = $"{Endpoints.USERS}/@me{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBER}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { guild_id = guildId.ToString(CultureInfo.InvariantCulture) }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new
+		{
+			guild_id = guildId.ToString(CultureInfo.InvariantCulture)
+		}, out var path);
 
 		var headers = Utilities.GetBaseHeaders();
 		headers.Add("Bearer", accessToken);
@@ -6264,7 +6922,10 @@ internal async Task<DiscordApplicationRoleConnection> GetCurrentUserApplicationR
 		// ReSharper disable once HeuristicUnreachableCode
 		var route = $"{Endpoints.USERS}/@me{Endpoints.APPLICATIONS}/:application_id/{Endpoints.ROLE_CONNECTIONS}";
 		var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route,
-			new { application_id = this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture) }, out var path);
+			new
+			{
+				application_id = this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture)
+			}, out var path);
 
 		var headers = Utilities.GetBaseHeaders();
 		headers.Add("Bearer", accessToken);
@@ -6289,14 +6950,15 @@ internal Task ModifyCurrentUserApplicationRoleConnectionAsync(string accessToken
 
 		RestOAuth2ApplicationRoleConnectionPayload pld = new()
 		{
-			PlatformName = platformName,
-			PlatformUsername = platformUsername,
-			Metadata = metadata.HasValue ? metadata.Value.GetKeyValuePairs() : Optional<Dictionary<string, string>>.None
+			PlatformName = platformName, PlatformUsername = platformUsername, Metadata = metadata.HasValue ? metadata.Value.GetKeyValuePairs() : Optional<Dictionary<string, string>>.None
 		};
 
 		// ReSharper disable once HeuristicUnreachableCode
 		var route = $"{Endpoints.USERS}/@me{Endpoints.APPLICATIONS}/:application_id/{Endpoints.ROLE_CONNECTIONS}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new { application_id = this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture) }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new
+		{
+			application_id = this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture)
+		}, out var path);
 
 		var headers = Utilities.GetBaseHeaders();
 		headers.Add("Bearer", accessToken);
@@ -6317,15 +6979,26 @@ internal async Task<DiscordAccessToken> ExchangeOAuth2AccessTokenAsync(string co
 
 		// ReSharper disable once HeuristicUnreachableCode
 		var route = $"{Endpoints.OAUTH2}{Endpoints.TOKEN}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+			{ }, out var path);
 
 		var formData = new Dictionary<string, string>
 		{
-			{ "client_id", this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture) },
-			{ "client_secret", this.OAuth2Client.ClientSecret },
-			{ "grant_type", "authorization_code" },
-			{ "code", code },
-			{ "redirect_uri", this.OAuth2Client.RedirectUri.AbsoluteUri }
+			{
+				"client_id", this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture)
+			},
+			{
+				"client_secret", this.OAuth2Client.ClientSecret
+			},
+			{
+				"grant_type", "authorization_code"
+			},
+			{
+				"code", code
+			},
+			{
+				"redirect_uri", this.OAuth2Client.RedirectUri.AbsoluteUri
+			}
 		};
 
 		var url = Utilities.GetApiUriFor(path);
@@ -6346,15 +7019,26 @@ internal async Task<DiscordAccessToken> RefreshOAuth2AccessTokenAsync(string ref
 
 		// ReSharper disable once HeuristicUnreachableCode
 		var route = $"{Endpoints.OAUTH2}{Endpoints.TOKEN}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+			{ }, out var path);
 
 		var formData = new Dictionary<string, string>
 		{
-			{ "client_id", this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture) },
-			{ "client_secret", this.OAuth2Client.ClientSecret },
-			{ "grant_type", "refresh_token" },
-			{ "refresh_token", refreshToken },
-			{ "redirect_uri", this.OAuth2Client.RedirectUri.AbsoluteUri }
+			{
+				"client_id", this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture)
+			},
+			{
+				"client_secret", this.OAuth2Client.ClientSecret
+			},
+			{
+				"grant_type", "refresh_token"
+			},
+			{
+				"refresh_token", refreshToken
+			},
+			{
+				"redirect_uri", this.OAuth2Client.RedirectUri.AbsoluteUri
+			}
 		};
 
 		var url = Utilities.GetApiUriFor(path);
@@ -6376,7 +7060,8 @@ internal Task RevokeOAuth2TokenAsync(string token, string type)
 
 		// ReSharper disable once HeuristicUnreachableCode
 		var route = $"{Endpoints.OAUTH2}{Endpoints.TOKEN}{Endpoints.REVOKE}";
-		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { }, out var path);
+		var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new
+			{ }, out var path);
 
 		var authorizationString = Encoding.UTF8.GetBytes($"{this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture)}:{this.OAuth2Client.ClientSecret}");
 		var base64EncodedAuthorizationString = Convert.ToBase64String(authorizationString);
@@ -6386,8 +7071,12 @@ internal Task RevokeOAuth2TokenAsync(string token, string type)
 
 		var formData = new Dictionary<string, string>
 		{
-			{ "token", token },
-			{ "token_type_hint", type }
+			{
+				"token", token
+			},
+			{
+				"token_type_hint", type
+			}
 		};
 
 		var url = Utilities.GetApiUriFor(path);
@@ -6395,5 +7084,5 @@ internal Task RevokeOAuth2TokenAsync(string token, string type)
 		return Task.CompletedTask;
 	}
 
-	#endregion
+#endregion
 }
diff --git a/DisCatSharp/Net/Rest/MultipartWebRequest.cs b/DisCatSharp/Net/Rest/MultipartWebRequest.cs
index 8e7036eb50..81dbd35d78 100644
--- a/DisCatSharp/Net/Rest/MultipartWebRequest.cs
+++ b/DisCatSharp/Net/Rest/MultipartWebRequest.cs
@@ -40,8 +40,18 @@ internal sealed class MultipartWebRequest : BaseRestRequest
 	/// <param name="files">The files.</param>
 	/// <param name="ratelimitWaitOverride">The ratelimit_wait_override.</param>
 	/// <param name="overwriteFileIdStart">The file id start.</param>
-	internal MultipartWebRequest(BaseDiscordClient client, RateLimitBucket bucket, Uri url, RestRequestMethod method, string route, IReadOnlyDictionary<string, string> headers = null, IReadOnlyDictionary<string, string> values = null,
-		IReadOnlyCollection<DiscordMessageFile> files = null, double? ratelimitWaitOverride = null, int? overwriteFileIdStart = null)
+	internal MultipartWebRequest(
+		BaseDiscordClient client,
+		RateLimitBucket bucket,
+		Uri url,
+		RestRequestMethod method,
+		string route,
+		IReadOnlyDictionary<string, string> headers = null,
+		IReadOnlyDictionary<string, string> values = null,
+		IReadOnlyCollection<DiscordMessageFile> files = null,
+		double? ratelimitWaitOverride = null,
+		int? overwriteFileIdStart = null
+	)
 		: base(client, bucket, url, method, route, headers, ratelimitWaitOverride)
 	{
 		this.Values = values;
@@ -50,7 +60,6 @@ internal MultipartWebRequest(BaseDiscordClient client, RateLimitBucket bucket, U
 	}
 }
 
-
 /// <summary>
 /// Represents a multipart HTTP request for stickers.
 /// </summary>
@@ -90,8 +99,19 @@ internal sealed class MultipartStickerWebRequest : BaseRestRequest
 	/// <param name="tags">The sticker tag.</param>
 	/// <param name="description">The sticker description.</param>
 	/// <param name="ratelimitWaitOverride">The ratelimit_wait_override.</param>
-	internal MultipartStickerWebRequest(BaseDiscordClient client, RateLimitBucket bucket, Uri url, RestRequestMethod method, string route, IReadOnlyDictionary<string, string> headers = null,
-		DiscordMessageFile file = null, string name = "", string tags = "", string description = "", double? ratelimitWaitOverride = null)
+	internal MultipartStickerWebRequest(
+		BaseDiscordClient client,
+		RateLimitBucket bucket,
+		Uri url,
+		RestRequestMethod method,
+		string route,
+		IReadOnlyDictionary<string, string> headers = null,
+		DiscordMessageFile file = null,
+		string name = "",
+		string tags = "",
+		string description = "",
+		double? ratelimitWaitOverride = null
+	)
 		: base(client, bucket, url, method, route, headers, ratelimitWaitOverride)
 	{
 		this.File = file;
diff --git a/DisCatSharp/Net/Rest/RestClient.cs b/DisCatSharp/Net/Rest/RestClient.cs
index fd085b7872..79972d619a 100644
--- a/DisCatSharp/Net/Rest/RestClient.cs
+++ b/DisCatSharp/Net/Rest/RestClient.cs
@@ -106,23 +106,23 @@ internal RestClient(BaseDiscordClient client)
 	/// <param name="timeout">The timeout.</param>
 	/// <param name="useRelativeRatelimit">Whether to use relative ratelimit.</param>
 	/// <param name="logger">The logger.</param>
-	internal RestClient(IWebProxy proxy, TimeSpan timeout, bool useRelativeRatelimit,
-		ILogger logger)
+	internal RestClient(
+		IWebProxy proxy,
+		TimeSpan timeout,
+		bool useRelativeRatelimit,
+		ILogger logger
+	)
 	{
 		this._logger = logger;
 
 		var httphandler = new HttpClientHandler
 		{
-			UseCookies = false,
-			AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip,
-			UseProxy = proxy != null,
-			Proxy = proxy
+			UseCookies = false, AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip, UseProxy = proxy != null, Proxy = proxy
 		};
 
 		this.HttpClient = new(httphandler)
 		{
-			BaseAddress = new(Utilities.GetApiBaseUri(this._discord?.Configuration)),
-			Timeout = timeout
+			BaseAddress = new(Utilities.GetApiBaseUri(this._discord?.Configuration)), Timeout = timeout
 		};
 
 		this.HttpClient.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", Utilities.GetUserAgent());
@@ -163,10 +163,12 @@ public RateLimitBucket GetBucket(RestRequestMethod method, string route, object
 			rparams[xp.Name] = val is string xs
 				? xs
 				: val is DateTime dt
-				? dt.ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture)
-				: val is DateTimeOffset dto
-				? dto.ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture)
-				: val is IFormattable xf ? xf.ToString(null, CultureInfo.InvariantCulture) : val.ToString();
+					? dt.ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture)
+					: val is DateTimeOffset dto
+						? dto.ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture)
+						: val is IFormattable xf
+							? xf.ToString(null, CultureInfo.InvariantCulture)
+							: val.ToString();
 		}
 
 		var guildId = rparams.TryGetValue("guild_id", out var rparam) ? rparam : "";
@@ -225,7 +227,6 @@ public RateLimitBucket GetBucket(RestRequestMethod method, string route, object
 	public Task ExecuteRequestAsync(BaseRestRequest request)
 		=> request == null ? throw new ArgumentNullException(nameof(request)) : this.ExecuteRequestAsync(request, null, null);
 
-
 	/// <summary>
 	/// Executes the form data request.
 	/// </summary>
@@ -423,19 +424,12 @@ private async Task ExecuteFormRequestAsync(BaseRestRequest request, RateLimitBuc
 			// If it's 0 or less, we can remove the bucket from the active request queue,
 			// along with any of its past routes.
 			if (count <= 0)
-			{
 				foreach (var r in bucket.RouteHashes)
-				{
 					if (this._requestQueue.ContainsKey(r))
-					{
 						_ = this._requestQueue.TryRemove(r, out _);
-					}
-				}
-			}
 		}
 	}
 
-
 	/// <summary>
 	/// Executes the request.
 	/// This is to allow proper rescheduling of the first request from a bucket.
@@ -493,6 +487,7 @@ private async Task ExecuteRequestAsync(BaseRestRequest request, RateLimitBucket
 
 					return;
 				}
+
 				this._logger.LogDebug(LoggerEvents.RatelimitDiag, "Request for {bucket} is allowed. Url: {url}", bucket.ToString(), request.Url.AbsoluteUri);
 			}
 			else
@@ -574,19 +569,17 @@ private async Task ExecuteRequestAsync(BaseRestRequest request, RateLimitBucket
 								// we don't want to wait here until all the blocked requests have been run, additionally Set can never throw an exception that could be suppressed here
 								_ = this._globalRateLimitEvent.SetAsync();
 							}
+
 							this.ExecuteRequestAsync(request, bucket, ratelimitTcs)
 								.LogTaskFault(this._logger, LogLevel.Error, LoggerEvents.RestError, "Error while retrying request");
 						}
 						else
 						{
 							if (this._discord is not null && this._discord is DiscordClient)
-							{
 								await (this._discord as DiscordClient).RateLimitHitInternal.InvokeAsync(this._discord as DiscordClient, new(this._discord.ServiceProvider)
 								{
-									Exception = ex as RateLimitException,
-									ApiEndpoint = request.Url.AbsoluteUri
+									Exception = ex as RateLimitException, ApiEndpoint = request.Url.AbsoluteUri
 								});
-							}
 							this._logger.LogError(LoggerEvents.RatelimitHit, "Ratelimit hit, requeuing request to {url}", request.Url.AbsoluteUri);
 							await wait.ConfigureAwait(false);
 							this.ExecuteRequestAsync(request, bucket, ratelimitTcs)
@@ -595,6 +588,7 @@ private async Task ExecuteRequestAsync(BaseRestRequest request, RateLimitBucket
 
 						return;
 					}
+
 					break;
 
 				case 500:
@@ -609,18 +603,21 @@ private async Task ExecuteRequestAsync(BaseRestRequest request, RateLimitBucket
 			if (ex != null)
 			{
 				if (this._discord?.Configuration.EnableSentry ?? false)
-				{
 					if (senex != null)
 					{
 						Dictionary<string, object> debugInfo = new()
 						{
-							{ "route", request.Route },
-							{ "time", DateTimeOffset.UtcNow }
+							{
+								"route", request.Route
+							},
+							{
+								"time", DateTimeOffset.UtcNow
+							}
 						};
 						senex.AddSentryContext("Request", debugInfo);
 						this._discord.Sentry.CaptureException(senex);
 					}
-				}
+
 				request.SetFaulted(ex);
 			}
 			else
@@ -648,15 +645,9 @@ private async Task ExecuteRequestAsync(BaseRestRequest request, RateLimitBucket
 			// If it's 0 or less, we can remove the bucket from the active request queue,
 			// along with any of its past routes.
 			if (count <= 0)
-			{
 				foreach (var r in bucket.RouteHashes)
-				{
 					if (this._requestQueue.ContainsKey(r))
-					{
 						_ = this._requestQueue.TryRemove(r, out _);
-					}
-				}
-			}
 		}
 	}
 
@@ -699,7 +690,6 @@ private async Task<TaskCompletionSource<bool>> WaitForInitialRateLimit(RateLimit
 		while (!bucket.LimitValid)
 		{
 			if (bucket.LimitTesting == 0)
-			{
 				if (Interlocked.CompareExchange(ref bucket.LimitTesting, 1, 0) == 0)
 				{
 					// if we got here when the first request was just finishing, we must not create the waiter task as it would signal ExecuteRequestAsync to bypass rate limiting
@@ -711,7 +701,7 @@ private async Task<TaskCompletionSource<bool>> WaitForInitialRateLimit(RateLimit
 					bucket.LimitTestFinished = ratelimitsTcs.Task;
 					return ratelimitsTcs;
 				}
-			}
+
 			// it can take a couple of cycles for the task to be allocated, so wait until it happens or we are no longer probing for the limits
 			Task waitTask = null;
 			while (bucket.LimitTesting != 0 && (waitTask = bucket.LimitTestFinished) == null)
@@ -793,14 +783,12 @@ private HttpRequestMessage BuildRequest(BaseRestRequest request)
 			var fileId = mprequest.OverwriteFileIdStart ?? 0;
 
 			if (mprequest.Files != null && mprequest.Files.Any())
-			{
 				foreach (var f in mprequest.Files)
 				{
 					var name = $"files[{fileId.ToString(CultureInfo.InvariantCulture)}]";
 					content.Add(new StreamContent(f.Value), name, f.Key);
 					fileId++;
 				}
-			}
 
 			req.Content = content;
 		}
@@ -826,10 +814,18 @@ private HttpRequestMessage BuildRequest(BaseRestRequest request)
 
 			var content = new MultipartFormDataContent(boundary)
 			{
-				{ new StringContent(mpsrequest.Name), "name" },
-				{ new StringContent(mpsrequest.Tags), "tags" },
-				{ new StringContent(mpsrequest.Description), "description" },
-				{ sc, "file", fileName }
+				{
+					new StringContent(mpsrequest.Name), "name"
+				},
+				{
+					new StringContent(mpsrequest.Tags), "tags"
+				},
+				{
+					new StringContent(mpsrequest.Description), "description"
+				},
+				{
+					sc, "file", fileName
+				}
 			};
 
 			req.Content = content;
@@ -851,6 +847,7 @@ private void Handle429(RestResponse response, out Task waitTask, out bool global
 
 		if (response.Headers == null)
 			return;
+
 		var hs = response.Headers;
 
 		// handle the wait
@@ -862,10 +859,8 @@ private void Handle429(RestResponse response, out Task waitTask, out bool global
 
 		// check if global b1nzy
 		if (hs.TryGetValue("X-RateLimit-Global", out var isGlobal) && isGlobal.ToLowerInvariant() == "true")
-		{
 			// global
 			global = true;
-		}
 	}
 
 	/// <summary>
@@ -888,10 +883,7 @@ private void UpdateBucket(BaseRestRequest request, RestResponse response, TaskCo
 		var hs = response.Headers;
 
 		if (hs.TryGetValue("X-RateLimit-Scope", out var scope))
-		{
 			bucket.Scope = scope;
-		}
-
 
 		if (hs.TryGetValue("X-RateLimit-Global", out var isGlobal) && isGlobal.ToLowerInvariant() == "true")
 		{
@@ -1036,7 +1028,7 @@ private async Task CleanupBucketsAsync()
 			{
 				var bucket = this._hashesToBuckets.Values.FirstOrDefault(x => x.RouteHashes.Contains(key));
 
-				if (bucket == null || (bucket != null && bucket.LastAttemptAt.AddSeconds(5) < DateTimeOffset.UtcNow))
+				if (bucket == null || bucket != null && bucket.LastAttemptAt.AddSeconds(5) < DateTimeOffset.UtcNow)
 					_ = this._requestQueue.TryRemove(key, out _);
 			}
 
diff --git a/DisCatSharp/Net/Rest/RestRequestMethod.cs b/DisCatSharp/Net/Rest/RestRequestMethod.cs
index aa1613e0b3..329ebaa803 100644
--- a/DisCatSharp/Net/Rest/RestRequestMethod.cs
+++ b/DisCatSharp/Net/Rest/RestRequestMethod.cs
@@ -1,4 +1,3 @@
-
 // ReSharper disable InconsistentNaming
 
 namespace DisCatSharp.Net;
diff --git a/DisCatSharp/Net/Serialization/DiscordComponentJsonConverter.cs b/DisCatSharp/Net/Serialization/DiscordComponentJsonConverter.cs
index 77a3d5f114..a0b13ecc50 100644
--- a/DisCatSharp/Net/Serialization/DiscordComponentJsonConverter.cs
+++ b/DisCatSharp/Net/Serialization/DiscordComponentJsonConverter.cs
@@ -39,7 +39,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return null;
 
 		var job = JObject.Load(reader);
-		var type = (job["type"]?.ToObject<ComponentType>()) ?? throw new ArgumentException($"Value {reader} does not have a component type specifier");
+		var type = job["type"]?.ToObject<ComponentType>() ?? throw new ArgumentException($"Value {reader} does not have a component type specifier");
 		DiscordComponent cmp;
 		cmp = type switch
 		{
@@ -52,7 +52,10 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			ComponentType.RoleSelect => new DiscordRoleSelectComponent(),
 			ComponentType.MentionableSelect => new DiscordMentionableSelectComponent(),
 			ComponentType.ChannelSelect => new DiscordChannelSelectComponent(),
-			_ => new() { Type = type }
+			_ => new()
+			{
+				Type = type
+			}
 		};
 
 		// Populate the existing component with the values in the JObject. This avoids a recursive JsonConverter loop
diff --git a/DisCatSharp/Net/Serialization/DiscordJson.cs b/DisCatSharp/Net/Serialization/DiscordJson.cs
index 50f8b0892c..efbb7957cd 100644
--- a/DisCatSharp/Net/Serialization/DiscordJson.cs
+++ b/DisCatSharp/Net/Serialization/DiscordJson.cs
@@ -70,6 +70,7 @@ private static string SerializeObjectInternal(object value, Type type, JsonSeria
 			jsonTextWriter.Formatting = jsonSerializer.Formatting;
 			jsonSerializer.Serialize(jsonTextWriter, value, type);
 		}
+
 		return stringWriter.ToString();
 	}
 
@@ -81,25 +82,26 @@ private static T DeserializeObjectInternal<T>(string json, BaseDiscordClient? di
 		})!;
 		if (discord == null)
 			return obj;
+
 		obj.Discord = discord;
 
 		if (!discord.Configuration.ReportMissingFields || !obj.AdditionalProperties.Any()) return obj;
+
 		var sentryMessage = "Found missing properties in api response for " + obj.GetType().Name;
 		List<string> sentryFields = new();
 		var vals = 0;
 		foreach (var ap in obj.AdditionalProperties)
 		{
 			vals++;
-			if (obj.IgnoredJsonKeys.Count == 0 || !obj.IgnoredJsonKeys.Any(x => x == ap.Key))
+			if (obj.IgnoredJsonKeys.Count == 0 || obj.IgnoredJsonKeys.All(x => x != ap.Key))
 			{
 				if (vals == 1)
-				{
 					if (discord.Configuration.EnableLibraryDeveloperMode)
 					{
 						discord.Logger.LogInformation("{sentry}", sentryMessage);
 						discord.Logger.LogDebug("{json}", json);
 					}
-				}
+
 				sentryFields.Add(ap.Key);
 				if (discord.Configuration.EnableLibraryDeveloperMode)
 					discord.Logger.LogInformation("Found field {field} on {object}", ap.Key, obj.GetType().Name);
@@ -107,13 +109,12 @@ private static T DeserializeObjectInternal<T>(string json, BaseDiscordClient? di
 		}
 
 		if (!discord.Configuration.EnableSentry || sentryFields.Count == 0) return obj;
+
 		var sentryJson = JsonConvert.SerializeObject(sentryFields);
 		sentryMessage += "\n\nNew fields: " + sentryJson;
 		SentryEvent sentryEvent = new()
 		{
-			Level = SentryLevel.Warning,
-			Logger = nameof(DiscordJson),
-			Message = sentryMessage
+			Level = SentryLevel.Warning, Logger = nameof(DiscordJson), Message = sentryMessage
 		};
 		sentryEvent.SetFingerprint(BaseDiscordClient.GenerateSentryFingerPrint(sentryEvent));
 		sentryEvent.SetExtra("Found Fields", sentryJson);
@@ -124,8 +125,12 @@ private static T DeserializeObjectInternal<T>(string json, BaseDiscordClient? di
 				Username = discord.CurrentUser.UsernameWithDiscriminator,
 				Other = new Dictionary<string, string>()
 				{
-					{ "developer", discord.Configuration.DeveloperUserId?.ToString() ?? "not_given" },
-					{ "email", discord.Configuration.FeedbackEmail ?? "not_given" }
+					{
+						"developer", discord.Configuration.DeveloperUserId?.ToString() ?? "not_given"
+					},
+					{
+						"email", discord.Configuration.FeedbackEmail ?? "not_given"
+					}
 				}
 			};
 		var sid = discord.Sentry.CaptureEvent(sentryEvent);
@@ -144,10 +149,12 @@ private static T DeserializeIEnumerableObjectInternal<T>(string json, BaseDiscor
 		})!;
 		if (discord == null)
 			return obj;
+
 		foreach (var ob in obj)
 			ob.Discord = discord;
 
 		if (!discord.Configuration.ReportMissingFields || !obj.Any(x => x.AdditionalProperties.Any())) return obj;
+
 		var first = obj.First();
 		var sentryMessage = "Found missing properties in api response for " + first.GetType().Name;
 		List<string> sentryFields = new();
@@ -158,13 +165,12 @@ private static T DeserializeIEnumerableObjectInternal<T>(string json, BaseDiscor
 			if (first.IgnoredJsonKeys.Count == 0 || !first.IgnoredJsonKeys.Any(x => x == ap.Key))
 			{
 				if (vals == 1)
-				{
 					if (discord.Configuration.EnableLibraryDeveloperMode)
 					{
 						discord.Logger.LogInformation("{sentry}", sentryMessage);
 						discord.Logger.LogDebug("{json}", json);
 					}
-				}
+
 				sentryFields.Add(ap.Key);
 				if (discord.Configuration.EnableLibraryDeveloperMode)
 					discord.Logger.LogInformation("Found field {field} on {object}", ap.Key, first.GetType().Name);
@@ -172,13 +178,12 @@ private static T DeserializeIEnumerableObjectInternal<T>(string json, BaseDiscor
 		}
 
 		if (!discord.Configuration.EnableSentry || sentryFields.Count == 0) return obj;
+
 		var sentryJson = JsonConvert.SerializeObject(sentryFields);
 		sentryMessage += "\n\nNew fields: " + sentryJson;
 		SentryEvent sentryEvent = new()
 		{
-			Level = SentryLevel.Warning,
-			Logger = nameof(DiscordJson),
-			Message = sentryMessage
+			Level = SentryLevel.Warning, Logger = nameof(DiscordJson), Message = sentryMessage
 		};
 		sentryEvent.SetFingerprint(BaseDiscordClient.GenerateSentryFingerPrint(sentryEvent));
 		sentryEvent.SetExtra("Found Fields", sentryJson);
@@ -189,8 +194,12 @@ private static T DeserializeIEnumerableObjectInternal<T>(string json, BaseDiscor
 				Username = discord.CurrentUser.UsernameWithDiscriminator,
 				Other = new Dictionary<string, string>()
 				{
-					{ "developer", discord.Configuration.DeveloperUserId?.ToString() ?? "not_given" },
-					{ "email", discord.Configuration.FeedbackEmail ?? "not_given" }
+					{
+						"developer", discord.Configuration.DeveloperUserId?.ToString() ?? "not_given"
+					},
+					{
+						"email", discord.Configuration.FeedbackEmail ?? "not_given"
+					}
 				}
 			};
 		var sid = discord.Sentry.CaptureEvent(sentryEvent);
diff --git a/DisCatSharp/Net/Serialization/SnowflakeArrayAsDictionaryJsonConverter.cs b/DisCatSharp/Net/Serialization/SnowflakeArrayAsDictionaryJsonConverter.cs
index 11eca77177..d6fc01d754 100644
--- a/DisCatSharp/Net/Serialization/SnowflakeArrayAsDictionaryJsonConverter.cs
+++ b/DisCatSharp/Net/Serialization/SnowflakeArrayAsDictionaryJsonConverter.cs
@@ -30,9 +30,7 @@ internal class SnowflakeArrayAsDictionaryJsonConverter : JsonConverter
 	public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 	{
 		if (value == null)
-		{
 			writer.WriteNull();
-		}
 		else
 		{
 			var type = value.GetType().GetTypeInfo();
@@ -57,16 +55,14 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		// the default name of an indexer is "Item"
 		var properties = objectType.GetTypeInfo().GetDeclaredProperty("Item");
 
-		var entries = (IEnumerable) serializer.Deserialize(reader, objectType.GenericTypeArguments[1].MakeArrayType());
+		var entries = (IEnumerable)serializer.Deserialize(reader, objectType.GenericTypeArguments[1].MakeArrayType());
 		foreach (var entry in entries)
-		{
 			properties.SetValue(dict, entry, new object[]
 			{
 				(entry as SnowflakeObject)?.Id
 				?? (entry as DiscordVoiceState)?.UserId
 				?? throw new InvalidOperationException($"Type {entry?.GetType()} is not deserializable")
 			});
-		}
 
 		return dict;
 	}
@@ -83,6 +79,6 @@ public override bool CanConvert(Type objectType)
 
 		var valueParam = objectType.GenericTypeArguments[1];
 		return typeof(SnowflakeObject).GetTypeInfo().IsAssignableFrom(valueParam.GetTypeInfo()) ||
-			   valueParam == typeof(DiscordVoiceState);
+		       valueParam == typeof(DiscordVoiceState);
 	}
 }
diff --git a/DisCatSharp/Net/Udp/DCSUdpClient.cs b/DisCatSharp/Net/Udp/DCSUdpClient.cs
index 2833e84ce2..f4be062f2d 100644
--- a/DisCatSharp/Net/Udp/DCSUdpClient.cs
+++ b/DisCatSharp/Net/Udp/DCSUdpClient.cs
@@ -26,7 +26,6 @@ internal class DcsUdpClient : BaseUdpClient
 	/// </summary>
 	private readonly BlockingCollection<byte[]> _packetQueue;
 
-
 	/// <summary>
 	/// Gets the receiver task.
 	/// </summary>
@@ -104,14 +103,12 @@ public override void Close()
 	private async Task ReceiverLoopAsync()
 	{
 		while (!this.TOKEN.IsCancellationRequested)
-		{
 			try
 			{
 				var packet = await this._client.ReceiveAsync().ConfigureAwait(false);
 				this._packetQueue.Add(packet.Buffer);
 			}
 			catch (Exception) { }
-		}
 	}
 
 	/// <summary>
diff --git a/DisCatSharp/Net/WebSocket/SocketLock.cs b/DisCatSharp/Net/WebSocket/SocketLock.cs
index e8b3ef923c..0a6bed2148 100644
--- a/DisCatSharp/Net/WebSocket/SocketLock.cs
+++ b/DisCatSharp/Net/WebSocket/SocketLock.cs
@@ -81,6 +81,7 @@ public void UnlockAfter(TimeSpan unlockDelay)
 			this._timeoutCancelSource.Dispose();
 		}
 		catch { }
+
 		this._timeoutCancelSource = null;
 
 		this._unlockTask = Task.Delay(unlockDelay, CancellationToken.None);
diff --git a/DisCatSharp/Net/WebSocket/WebSocketClient.cs b/DisCatSharp/Net/WebSocket/WebSocketClient.cs
index 49b0ca63f2..ded4877a0b 100644
--- a/DisCatSharp/Net/WebSocket/WebSocketClient.cs
+++ b/DisCatSharp/Net/WebSocket/WebSocketClient.cs
@@ -96,7 +96,8 @@ private WebSocketClient(IWebProxy proxy, IServiceProvider provider)
 	public async Task ConnectAsync(Uri uri)
 	{
 		// Disconnect first
-		try { await this.DisconnectAsync().ConfigureAwait(false); } catch { }
+		try { await this.DisconnectAsync().ConfigureAwait(false); }
+		catch { }
 
 		// Disallow sending messages
 		await this._senderLock.WaitAsync().ConfigureAwait(false);
@@ -275,8 +276,7 @@ internal async Task ReceiverLoopAsync()
 						break;
 
 					bs.Write(buffer.Array, 0, result.Count);
-				}
-				while (!result.EndOfMessage);
+				} while (!result.EndOfMessage);
 
 				resultBytes = new byte[bs.Length];
 				bs.Position = 0;
@@ -291,13 +291,9 @@ internal async Task ReceiverLoopAsync()
 				}
 
 				if (result.MessageType == WebSocketMessageType.Binary)
-				{
 					await this._messageReceived.InvokeAsync(this, new SocketBinaryMessageEventArgs(resultBytes)).ConfigureAwait(false);
-				}
 				else if (result.MessageType == WebSocketMessageType.Text)
-				{
 					await this._messageReceived.InvokeAsync(this, new SocketTextMessageEventArgs(Utilities.UTF8.GetString(resultBytes))).ConfigureAwait(false);
-				}
 				else // close
 				{
 					if (!this._isClientClose)
@@ -310,15 +306,24 @@ internal async Task ReceiverLoopAsync()
 						await this._ws.CloseOutputAsync(code, result.CloseStatusDescription, CancellationToken.None).ConfigureAwait(false);
 					}
 
-					await this._disconnected.InvokeAsync(this, new(this._serviceProvider) { CloseCode = (int)result.CloseStatus, CloseMessage = result.CloseStatusDescription }).ConfigureAwait(false);
+					await this._disconnected.InvokeAsync(this, new(this._serviceProvider)
+					{
+						CloseCode = (int)result.CloseStatus, CloseMessage = result.CloseStatusDescription
+					}).ConfigureAwait(false);
 					break;
 				}
 			}
 		}
 		catch (Exception ex)
 		{
-			await this._exceptionThrown.InvokeAsync(this, new(this._serviceProvider) { Exception = ex }).ConfigureAwait(false);
-			await this._disconnected.InvokeAsync(this, new(this._serviceProvider) { CloseCode = -1, CloseMessage = "" }).ConfigureAwait(false);
+			await this._exceptionThrown.InvokeAsync(this, new(this._serviceProvider)
+			{
+				Exception = ex
+			}).ConfigureAwait(false);
+			await this._disconnected.InvokeAsync(this, new(this._serviceProvider)
+			{
+				CloseCode = -1, CloseMessage = ""
+			}).ConfigureAwait(false);
 		}
 
 		// Don't await or you deadlock
@@ -335,7 +340,8 @@ internal async Task ReceiverLoopAsync()
 	public static IWebSocketClient CreateNew(IWebProxy proxy, IServiceProvider provider)
 		=> new WebSocketClient(proxy, provider);
 
-	#region Events
+#region Events
+
 	/// <summary>
 	/// Triggered when the client connects successfully.
 	/// </summary>
@@ -344,6 +350,7 @@ public event AsyncEventHandler<IWebSocketClient, SocketEventArgs> Connected
 		add => this._connected.Register(value);
 		remove => this._connected.Unregister(value);
 	}
+
 	private readonly AsyncEvent<WebSocketClient, SocketEventArgs> _connected;
 
 	/// <summary>
@@ -354,6 +361,7 @@ public event AsyncEventHandler<IWebSocketClient, SocketCloseEventArgs> Disconnec
 		add => this._disconnected.Register(value);
 		remove => this._disconnected.Unregister(value);
 	}
+
 	private readonly AsyncEvent<WebSocketClient, SocketCloseEventArgs> _disconnected;
 
 	/// <summary>
@@ -364,6 +372,7 @@ public event AsyncEventHandler<IWebSocketClient, SocketMessageEventArgs> Message
 		add => this._messageReceived.Register(value);
 		remove => this._messageReceived.Unregister(value);
 	}
+
 	private readonly AsyncEvent<WebSocketClient, SocketMessageEventArgs> _messageReceived;
 
 	/// <summary>
@@ -374,6 +383,7 @@ public event AsyncEventHandler<IWebSocketClient, SocketErrorEventArgs> Exception
 		add => this._exceptionThrown.Register(value);
 		remove => this._exceptionThrown.Unregister(value);
 	}
+
 	private readonly AsyncEvent<WebSocketClient, SocketErrorEventArgs> _exceptionThrown;
 	private IServiceProvider _serviceProvider;
 
@@ -387,6 +397,10 @@ public event AsyncEventHandler<IWebSocketClient, SocketErrorEventArgs> Exception
 	/// <param name="eventArgs">The event args.</param>
 	private void EventErrorHandler<TArgs>(AsyncEvent<WebSocketClient, TArgs> asyncEvent, Exception ex, AsyncEventHandler<WebSocketClient, TArgs> handler, WebSocketClient sender, TArgs eventArgs)
 		where TArgs : AsyncEventArgs
-		=> this._exceptionThrown.InvokeAsync(this, new(this._serviceProvider) { Exception = ex }).ConfigureAwait(false).GetAwaiter().GetResult();
-	#endregion
+		=> this._exceptionThrown.InvokeAsync(this, new(this._serviceProvider)
+		{
+			Exception = ex
+		}).ConfigureAwait(false).GetAwaiter().GetResult();
+
+#endregion
 }
diff --git a/DisCatSharp/QueryUriBuilder.cs b/DisCatSharp/QueryUriBuilder.cs
index 1d9e681cd1..14c0976480 100644
--- a/DisCatSharp/QueryUriBuilder.cs
+++ b/DisCatSharp/QueryUriBuilder.cs
@@ -18,6 +18,7 @@ internal class QueryUriBuilder
 	/// Gets the query parameters.
 	/// </summary>
 	public IReadOnlyList<KeyValuePair<string, string>> QueryParameters => this._queryParams;
+
 	private readonly List<KeyValuePair<string, string>> _queryParams = new();
 
 	/// <summary>
diff --git a/DisCatSharp/RingBuffer.cs b/DisCatSharp/RingBuffer.cs
index af9c729941..d26d751024 100644
--- a/DisCatSharp/RingBuffer.cs
+++ b/DisCatSharp/RingBuffer.cs
@@ -39,6 +39,7 @@ public bool IsReadOnly
 	/// Gets or sets the internal collection of items.
 	/// </summary>
 	protected T[] InternalBuffer { get; set; }
+
 	private bool _reachedEnd;
 
 	/// <summary>
@@ -110,21 +111,18 @@ public void Add(T item)
 	public bool TryGet(Func<T, bool> predicate, out T item)
 	{
 		for (var i = this.CurrentIndex; i < this.InternalBuffer.Length; i++)
-		{
 			if (this.InternalBuffer[i] != null && predicate(this.InternalBuffer[i]))
 			{
 				item = this.InternalBuffer[i];
 				return true;
 			}
-		}
+
 		for (var i = 0; i < this.CurrentIndex; i++)
-		{
 			if (this.InternalBuffer[i] != null && predicate(this.InternalBuffer[i]))
 			{
 				item = this.InternalBuffer[i];
 				return true;
 			}
-		}
 
 		item = default;
 		return false;
@@ -186,13 +184,11 @@ public void CopyTo(T[] array, int index)
 	public bool Remove(Func<T, bool> predicate)
 	{
 		for (var i = 0; i < this.InternalBuffer.Length; i++)
-		{
 			if (this.InternalBuffer[i] != null && predicate(this.InternalBuffer[i]))
 			{
 				this.InternalBuffer[i] = default;
 				return true;
 			}
-		}
 
 		return false;
 	}
diff --git a/DisCatSharp/Utilities.cs b/DisCatSharp/Utilities.cs
index 20ee7a7e20..3b4fcd1557 100644
--- a/DisCatSharp/Utilities.cs
+++ b/DisCatSharp/Utilities.cs
@@ -133,7 +133,7 @@ internal static string GetFormattedToken(DiscordConfiguration config)
 		{
 			TokenType.Bearer => $"Bearer {config.Token}",
 			TokenType.Bot => $"Bot {config.Token}",
-			_ => throw new ArgumentException("Invalid token type specified.", nameof(config)),
+			_ => throw new ArgumentException("Invalid token type specified.", nameof(config))
 		};
 
 	/// <summary>
@@ -220,7 +220,7 @@ internal static IEnumerable<ulong> GetUserMentions(DiscordMessage message)
 		var regex = new Regex(@"<@!?(\d+)>", RegexOptions.ECMAScript | RegexOptions.Compiled);
 		var matches = regex.Matches(message.Content);
 		return from Match match in matches
-			   select ulong.Parse(match.Groups[1].Value, CultureInfo.InvariantCulture);
+			select ulong.Parse(match.Groups[1].Value, CultureInfo.InvariantCulture);
 	}
 
 	/// <summary>
@@ -233,7 +233,7 @@ internal static IEnumerable<ulong> GetRoleMentions(DiscordMessage message)
 		var regex = new Regex(@"<@&(\d+)>", RegexOptions.ECMAScript);
 		var matches = regex.Matches(message.Content);
 		return from Match match in matches
-			   select ulong.Parse(match.Groups[1].Value, CultureInfo.InvariantCulture);
+			select ulong.Parse(match.Groups[1].Value, CultureInfo.InvariantCulture);
 	}
 
 	/// <summary>
@@ -246,7 +246,7 @@ internal static IEnumerable<ulong> GetChannelMentions(DiscordMessage message)
 		var regex = new Regex(@"<#(\d+)>", RegexOptions.ECMAScript);
 		var matches = regex.Matches(message.Content);
 		return from Match match in matches
-			   select ulong.Parse(match.Groups[1].Value, CultureInfo.InvariantCulture);
+			select ulong.Parse(match.Groups[1].Value, CultureInfo.InvariantCulture);
 	}
 
 	/// <summary>
@@ -259,7 +259,7 @@ internal static IEnumerable<ulong> GetEmojis(DiscordMessage message)
 		var regex = new Regex(@"<a?:([a-zA-Z0-9_]+):(\d+)>", RegexOptions.ECMAScript);
 		var matches = regex.Matches(message.Content);
 		return from Match match in matches
-			   select ulong.Parse(match.Groups[2].Value, CultureInfo.InvariantCulture);
+			select ulong.Parse(match.Groups[2].Value, CultureInfo.InvariantCulture);
 	}
 
 	/// <summary>
@@ -279,8 +279,7 @@ internal static bool IsValidSlashCommandName(string name)
 	/// <param name="guild">The guild.</param>
 	/// <param name="taad">The taad.</param>
 	/// <returns>A bool.</returns>
-	[DiscordDeprecated, Deprecated]
-	[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "<Pending>")]
+	[DiscordDeprecated, Deprecated, System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "<Pending>")]
 	internal static bool CheckThreadAutoArchiveDurationFeature(DiscordGuild guild, ThreadAutoArchiveDuration taad)
 		=> true;
 
@@ -289,8 +288,7 @@ internal static bool CheckThreadAutoArchiveDurationFeature(DiscordGuild guild, T
 	/// </summary>
 	/// <param name="guild">The guild.</param>
 	/// <returns>A bool.</returns>
-	[DiscordDeprecated, Deprecated]
-	[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "<Pending>")]
+	[DiscordDeprecated, Deprecated, System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "<Pending>")]
 	internal static bool CheckThreadPrivateFeature(DiscordGuild guild)
 		=> true;
 
@@ -404,7 +402,6 @@ public static DateTimeOffset GetSnowflakeTime(this ulong snowflake)
 	public static DateTimeOffset? GetSnowflakeTime(this ulong? snowflake)
 		=> snowflake is not null ? DiscordClient.DiscordEpoch.AddMilliseconds(snowflake.Value >> 22) : null;
 
-
 	/// <summary>
 	/// Converts this <see cref="Permissions"/> into human-readable format.
 	/// </summary>