diff --git a/App.axaml.cs b/App.axaml.cs
index e7162f1..22f740a 100644
--- a/App.axaml.cs
+++ b/App.axaml.cs
@@ -1,13 +1,11 @@
 using System;
-using System.Diagnostics;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using Avalonia.Threading;
-using BetterRaid.Extensions;
 using BetterRaid.Services;
-using BetterRaid.ViewModels;
+using BetterRaid.Services.Implementations;
 using BetterRaid.Views;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -25,12 +23,12 @@ public class App : Application
 
     private ServiceProvider InitializeServices()
     {
-        var Services = new ServiceCollection();
-        Services.AddSingleton<ITwitchService, TwitchService>();
-        Services.AddSingleton<ISynchronizaionService, DispatcherService>(serviceProvider => new DispatcherService(Dispatcher.UIThread));
-        Services.AddTransient<IMainViewModelFactory, MainWindowViewModelFactory>();
+        var services = new ServiceCollection();
+        services.AddSingleton<ITwitchService, TwitchService>();
+        services.AddSingleton<ISynchronizaionService, DispatcherService>(serviceProvider => new DispatcherService(Dispatcher.UIThread));
+        services.AddTransient<IMainViewModelFactory, MainWindowViewModelFactory>();
 
-        return Services.BuildServiceProvider();
+        return services.BuildServiceProvider();
     }
 
     public override void OnFrameworkInitializationCompleted()
@@ -44,7 +42,7 @@ public class App : Application
 
         var viewModelFactory = _serviceProvider.GetRequiredService<IMainViewModelFactory>();
         var mainWindowViewModel = viewModelFactory.CreateMainWindowViewModel();
-        var mainWindow = new MainWindow()
+        var mainWindow = new MainWindow
         {
             DataContext = mainWindowViewModel
         };
diff --git a/Services/Implementations/DispatcherService.cs b/Services/Implementations/DispatcherService.cs
index 124215e..71d0c2a 100644
--- a/Services/Implementations/DispatcherService.cs
+++ b/Services/Implementations/DispatcherService.cs
@@ -1,6 +1,5 @@
 using Avalonia.Threading;
 using System;
-using System.Threading;
 
 namespace BetterRaid.Services.Implementations;
 public class DispatcherService : ISynchronizaionService
diff --git a/Services/Implementations/MainWindowViewModelFactory.cs b/Services/Implementations/MainWindowViewModelFactory.cs
index 7e10ab5..24cd545 100644
--- a/Services/Implementations/MainWindowViewModelFactory.cs
+++ b/Services/Implementations/MainWindowViewModelFactory.cs
@@ -4,19 +4,17 @@ namespace BetterRaid.Services.Implementations;
 
 public class MainWindowViewModelFactory : IMainViewModelFactory
 {
-    private readonly ITwitchPubSubService twitchPubSubService;
-    private readonly ITwitchDataService twitchDataService;
-    private readonly ISynchronizaionService synchronizaionService;
+    private readonly ITwitchService _twitchService;
+    private readonly ISynchronizaionService _synchronizaionService;
 
-    public MainWindowViewModelFactory(ITwitchPubSubService twitchPubSubService, ITwitchDataService twitchDataService, ISynchronizaionService synchronizaionService)
+    public MainWindowViewModelFactory(ITwitchService twitchService, ISynchronizaionService synchronizaionService)
     {
-        this.twitchPubSubService = twitchPubSubService;
-        this.twitchDataService = twitchDataService;
-        this.synchronizaionService = synchronizaionService;
+        _twitchService = twitchService;
+        _synchronizaionService = synchronizaionService;
     }
 
     public MainWindowViewModel CreateMainWindowViewModel()
     {
-        return new MainWindowViewModel(twitchPubSubService, twitchDataService, synchronizaionService);
+        return new MainWindowViewModel(_twitchService, _synchronizaionService);
     }
 }
diff --git a/Services/TwitchService.cs b/Services/TwitchService.cs
index 3485586..aff40ed 100644
--- a/Services/TwitchService.cs
+++ b/Services/TwitchService.cs
@@ -10,8 +10,6 @@ using TwitchLib.Api;
 using TwitchLib.Api.Helix.Models.Users.GetUsers;
 using TwitchLib.PubSub;
 using TwitchLib.PubSub.Events;
-using OnEmoteOnlyArgs = TwitchLib.PubSub.Events.OnEmoteOnlyArgs;
-using OnLogArgs = TwitchLib.PubSub.Events.OnLogArgs;
 
 namespace BetterRaid.Services;