diff --git a/src/NadekoBot.Coordinator/CoordStartup.cs b/src/NadekoBot.Coordinator/CoordStartup.cs
index 250453e1c..2775c20b9 100644
--- a/src/NadekoBot.Coordinator/CoordStartup.cs
+++ b/src/NadekoBot.Coordinator/CoordStartup.cs
@@ -21,7 +21,7 @@ namespace NadekoBot.Coordinator
             services.AddGrpc();
             services.AddSingleton<CoordinatorRunner>();
             services.AddSingleton<IHostedService, CoordinatorRunner>(
-                serviceProvider => serviceProvider.GetService<CoordinatorRunner>());
+                serviceProvider => serviceProvider.GetRequiredService<CoordinatorRunner>());
         }
         
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
diff --git a/src/NadekoBot/Bot.cs b/src/NadekoBot/Bot.cs
index e7f41f664..1723e7621 100644
--- a/src/NadekoBot/Bot.cs
+++ b/src/NadekoBot/Bot.cs
@@ -177,7 +177,7 @@ namespace NadekoBot
             }
         }
 
-        // todo isn't there a built in for loading type readers?
+        // todo di typereaders
         private IEnumerable<object> LoadTypeReaders(Assembly assembly)
         {
             Type[] allTypes;
diff --git a/src/NadekoBot/Common/Attributes/Ratelimit.cs b/src/NadekoBot/Common/Attributes/Ratelimit.cs
index bf8d79f51..3a94c6ef7 100644
--- a/src/NadekoBot/Common/Attributes/Ratelimit.cs
+++ b/src/NadekoBot/Common/Attributes/Ratelimit.cs
@@ -24,7 +24,7 @@ namespace NadekoBot.Common.Attributes
             if (Seconds == 0)
                 return Task.FromResult(PreconditionResult.FromSuccess());
 
-            var cache = services.GetService<IDataCache>();
+            var cache = services.GetRequiredService<IDataCache>();
             var rem = cache.TryAddRatelimit(context.User.Id, command.Name, Seconds);
 
             if(rem is null)
diff --git a/src/NadekoBot/Common/Attributes/UserPerm.cs b/src/NadekoBot/Common/Attributes/UserPerm.cs
index f1870cf41..4b462e078 100644
--- a/src/NadekoBot/Common/Attributes/UserPerm.cs
+++ b/src/NadekoBot/Common/Attributes/UserPerm.cs
@@ -23,7 +23,7 @@ namespace Discord
 
         public override Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, CommandInfo command, IServiceProvider services)
         {
-            var permService = services.GetService<DiscordPermOverrideService>();
+            var permService = services.GetRequiredService<DiscordPermOverrideService>();
             if (permService.TryGetOverrides(context.Guild?.Id ?? 0, command.Name.ToUpperInvariant(), out var _))
                 return Task.FromResult(PreconditionResult.FromSuccess());
             
diff --git a/src/NadekoBot/Common/Extensions/ServiceCollectionExtensions.cs b/src/NadekoBot/Common/Extensions/ServiceCollectionExtensions.cs
index 4a41c4c8a..e770f0340 100644
--- a/src/NadekoBot/Common/Extensions/ServiceCollectionExtensions.cs
+++ b/src/NadekoBot/Common/Extensions/ServiceCollectionExtensions.cs
@@ -49,7 +49,7 @@ namespace NadekoBot.Extensions
                 .AddSingleton<IRadioResolver, RadioResolver>()
                 .AddSingleton<ITrackCacher, RedisTrackCacher>()
                 .AddSingleton<YtLoader>()
-                .AddSingleton<IPlaceholderProvider>(svc => svc.GetService<IMusicService>());
+                .AddSingleton<IPlaceholderProvider>(svc => svc.GetRequiredService<IMusicService>());
         
         // consider using scrutor, because slightly different versions
         // of this might be needed in several different places
diff --git a/src/NadekoBot/Common/TypeReaders/BotCommandTypeReader.cs b/src/NadekoBot/Common/TypeReaders/BotCommandTypeReader.cs
index d7dee463e..8e5dde165 100644
--- a/src/NadekoBot/Common/TypeReaders/BotCommandTypeReader.cs
+++ b/src/NadekoBot/Common/TypeReaders/BotCommandTypeReader.cs
@@ -50,9 +50,9 @@ namespace NadekoBot.Common.TypeReaders
         {
             input = input.ToUpperInvariant();
 
-            var _crs = services.GetService<CustomReactionsService>();
+            var crs = services.GetRequiredService<CustomReactionsService>();
 
-            if (_crs.ReactionExists(context.Guild?.Id, input))
+            if (crs.ReactionExists(context.Guild?.Id, input))
             {
                 return TypeReaderResult.FromSuccess(new CommandOrCrInfo(input, CommandOrCrInfo.Type.Custom));
             }
diff --git a/src/NadekoBot/Common/TypeReaders/GuildDateTimeTypeReader.cs b/src/NadekoBot/Common/TypeReaders/GuildDateTimeTypeReader.cs
index 5beeb9feb..ba48221e8 100644
--- a/src/NadekoBot/Common/TypeReaders/GuildDateTimeTypeReader.cs
+++ b/src/NadekoBot/Common/TypeReaders/GuildDateTimeTypeReader.cs
@@ -25,11 +25,11 @@ namespace NadekoBot.Common.TypeReaders
 
         public static GuildDateTime Parse(IServiceProvider services, ulong guildId, string input)
         {
-            var _gts = services.GetService<GuildTimezoneService>();
+            var gts = services.GetRequiredService<GuildTimezoneService>();
             if (!DateTime.TryParse(input, out var dt))
                 return null;
 
-            var tz = _gts.GetTimeZoneOrUtc(guildId);
+            var tz = gts.GetTimeZoneOrUtc(guildId);
 
             return new GuildDateTime(tz, dt);
         }
diff --git a/src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs b/src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs
index 0c9e1d813..13a320424 100644
--- a/src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs
+++ b/src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs
@@ -73,9 +73,9 @@ namespace NadekoBot.Common.TypeReaders
 
         private static long Cur(IServiceProvider services, ICommandContext ctx)
         {
-            var _db = services.GetService<DbService>();
+            var db = services.GetRequiredService<DbService>();
             long cur;
-            using (var uow = _db.GetDbContext())
+            using (var uow = db.GetDbContext())
             {
                 cur = uow.DiscordUser.GetUserCurrency(ctx.User.Id);
                 uow.SaveChanges();
@@ -85,7 +85,7 @@ namespace NadekoBot.Common.TypeReaders
 
         private static long Max(IServiceProvider services, ICommandContext ctx)
         {
-            var settings = services.GetService<GamblingConfigService>().Data;
+            var settings = services.GetRequiredService<GamblingConfigService>().Data;
             var max = settings.MaxBet;
             return max == 0
                 ? Cur(services, ctx)