diff --git a/ScrapModLoader/ModsLauncher.cs b/ScrapModLoader/ModsLauncher.cs
index 73e9c42..e4d6181 100644
--- a/ScrapModLoader/ModsLauncher.cs
+++ b/ScrapModLoader/ModsLauncher.cs
@@ -97,8 +97,8 @@ namespace ScrapModLoader
                     if (!mod.IsEnabled(gamePath))
                         mod.Enable(gamePath, SelectedGameVersion);
                     else
-                    if (mod.IsEnabled(gamePath))
-                        mod.Disable(gamePath);
+                        if (mod.IsEnabled(gamePath))
+                            mod.Disable(gamePath);
             }
         }
     }
diff --git a/ScrapModLoader/ScrapMod.cs b/ScrapModLoader/ScrapMod.cs
index c25f920..711d8cd 100644
--- a/ScrapModLoader/ScrapMod.cs
+++ b/ScrapModLoader/ScrapMod.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Media.Imaging;
-using System.Xml;
 
 using Ionic.Zip;
 
@@ -87,7 +86,7 @@ namespace ScrapModLoader
             gamePath += @"Mods\" + Name;
             Directory.CreateDirectory(gamePath);
 
-            using (var zipFile = ZipFile.Read(ModPath))
+            using (ZipFile zipFile = ZipFile.Read(ModPath))
             {
                 foreach (ZipEntry zipEntry in zipFile)
                 {
@@ -102,28 +101,28 @@ namespace ScrapModLoader
 
         public static ScrapMod LoadFromFile(String path)
         {
-            using var zipFile = ZipFile.Read(path);
+            using ZipFile zipFile = ZipFile.Read(path);
 
             Byte[] iconBuffer = Utils.ExtractFromZip(zipFile, "icon.png");
             Byte[] confBuffer = Utils.ExtractFromZip(zipFile, "config.toml");
 
-            var mod = new ScrapMod()
+            ScrapMod mod = new ScrapMod()
             {
                 ModPath = path,
                 Icon = Utils.LoadImage(iconBuffer)
             };
 
-            LoadConfig(ref mod, confBuffer);
+            LoadConfig(mod, confBuffer);
 
             return mod;
         }
 
 
 
-        private static void LoadConfig(ref ScrapMod mod, Byte[] buffer)
+        private static void LoadConfig(ScrapMod mod, Byte[] buffer)
         {
-            using var sourceStream = new MemoryStream(buffer);
-            using var reader = new StreamReader(sourceStream);
+            using MemoryStream sourceStream = new MemoryStream(buffer);
+            using StreamReader reader = new StreamReader(sourceStream);
 
             TomlTable config = TOML.Parse(reader);
 
diff --git a/ScrapModLoader/Utils.cs b/ScrapModLoader/Utils.cs
index 61bd172..43439e1 100644
--- a/ScrapModLoader/Utils.cs
+++ b/ScrapModLoader/Utils.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Windows.Media.Imaging;
 using System.IO;
+using System.Windows.Media.Imaging;
 
 using Ionic.Zip;
 
@@ -35,8 +35,8 @@ internal static class Utils
         if (entry == null)
             throw new FileFormatException($"No '{entry_path}' in {zip.Name} found");
 
-        var buffer = new Byte[entry.UncompressedSize];
-        using (var zipStream = new MemoryStream(buffer))
+        Byte[] buffer = new Byte[entry.UncompressedSize];
+        using (MemoryStream zipStream = new MemoryStream(buffer))
             entry.Extract(zipStream);
 
         return buffer;
@@ -44,9 +44,9 @@ internal static class Utils
 
     public static BitmapImage LoadImage(Byte[] buffer)
     {
-        using var sourceStream = new MemoryStream(buffer);
+        using MemoryStream sourceStream = new MemoryStream(buffer);
 
-        var image = new BitmapImage();
+        BitmapImage? image = new BitmapImage();
 
         image.BeginInit();
         image.CacheOption = BitmapCacheOption.OnLoad;