diff --git a/src/DateTimeRoutines/DateTimeRoutines.cs b/src/DateTimeRoutines/DateTimeRoutines.cs
index 8dbfc2ab2..3f2f448d1 100644
--- a/src/DateTimeRoutines/DateTimeRoutines.cs
+++ b/src/DateTimeRoutines/DateTimeRoutines.cs
@@ -25,8 +25,8 @@ namespace DateTimeRoutines
         /// <returns>seconds</returns>
         public static uint GetSecondsSinceUnixEpoch(this DateTime date_time)
         {
-            TimeSpan t = date_time - new DateTime(1970, 1, 1);
-            int ss = (int)t.TotalSeconds;
+            var t = date_time - new DateTime(1970, 1, 1);
+            var ss = (int)t.TotalSeconds;
             if (ss < 0)
                 return 0;
             return (uint)ss;
@@ -44,39 +44,39 @@ namespace DateTimeRoutines
             /// <summary>
             /// Index of first char of a date substring found in the string
             /// </summary>
-            readonly public int IndexOfDate = -1;
+            public readonly int IndexOfDate = -1;
             /// <summary>
             /// Length a date substring found in the string
             /// </summary>
-            readonly public int LengthOfDate = -1;
+            public readonly int LengthOfDate = -1;
             /// <summary>
             /// Index of first char of a time substring found in the string
             /// </summary>
-            readonly public int IndexOfTime = -1;
+            public readonly int IndexOfTime = -1;
             /// <summary>
             /// Length of a time substring found in the string
             /// </summary>
-            readonly public int LengthOfTime = -1;
+            public readonly int LengthOfTime = -1;
             /// <summary>
             /// DateTime found in the string
             /// </summary>
-            readonly public DateTime DateTime;
+            public readonly DateTime DateTime;
             /// <summary>
             /// True if a date was found within the string
             /// </summary>
-            readonly public bool IsDateFound;
+            public readonly bool IsDateFound;
             /// <summary>
             /// True if a time was found within the string
             /// </summary>
-            readonly public bool IsTimeFound;
+            public readonly bool IsTimeFound;
             /// <summary>
             /// UTC offset if it was found within the string
             /// </summary>
-            readonly public TimeSpan UtcOffset;
+            public readonly TimeSpan UtcOffset;
             /// <summary>
             /// True if UTC offset was found in the string
             /// </summary>
-            readonly public bool IsUtcOffsetFound;
+            public readonly bool IsUtcOffsetFound;
             /// <summary>
             /// Utc gotten from DateTime if IsUtcOffsetFound is True
             /// </summary>
@@ -113,7 +113,7 @@ namespace DateTimeRoutines
                 {
                     if (index_of_date < 0)//to avoid negative date exception when date is undefined
                     {
-                        TimeSpan ts = date_time.TimeOfDay + utc_offset;
+                        var ts = date_time.TimeOfDay + utc_offset;
                         if (ts < new TimeSpan(0))
                             UtcDateTime = new DateTime(1, 1, 2) + ts;
                         else
@@ -146,7 +146,8 @@ namespace DateTimeRoutines
                     return _DefaultDate;
             }
         }
-        static DateTime _DefaultDate = DateTime.Now;
+
+        private static DateTime _DefaultDate = DateTime.Now;
 
         /// <summary>
         /// If true then DefaultDate property is ignored and DefaultDate is always DateTime.Now
@@ -183,10 +184,9 @@ namespace DateTimeRoutines
         /// <param name="default_format">format to be used preferably in ambivalent instances</param>
         /// <param name="date_time">parsed date-time output</param>
         /// <returns>true if both date and time were found, else false</returns>
-        static public bool TryParseDateTime(this string str, DateTimeFormat default_format, out DateTime date_time)
+        public static bool TryParseDateTime(this string str, DateTimeFormat default_format, out DateTime date_time)
         {
-            ParsedDateTime parsed_date_time;
-            if (!TryParseDateTime(str, default_format, out parsed_date_time))
+            if (!TryParseDateTime(str, default_format, out ParsedDateTime parsed_date_time))
             {
                 date_time = new DateTime(1, 1, 1);
                 return false;
@@ -204,10 +204,9 @@ namespace DateTimeRoutines
         /// <param name="default_format">format to be used preferably in ambivalent instances</param>
         /// <param name="date_time">parsed date-time output</param>
         /// <returns>true if date and/or time was found, else false</returns>
-        static public bool TryParseDateOrTime(this string str, DateTimeFormat default_format, out DateTime date_time)
+        public static bool TryParseDateOrTime(this string str, DateTimeFormat default_format, out DateTime date_time)
         {
-            ParsedDateTime parsed_date_time;
-            if (!TryParseDateOrTime(str, default_format, out parsed_date_time))
+            if (!TryParseDateOrTime(str, default_format, out ParsedDateTime parsed_date_time))
             {
                 date_time = new DateTime(1, 1, 1);
                 return false;
@@ -226,8 +225,7 @@ namespace DateTimeRoutines
         /// <returns>true if time was found, else false</returns>
         public static bool TryParseTime(this string str, DateTimeFormat default_format, out DateTime time)
         {
-            ParsedDateTime parsed_time;
-            if (!TryParseTime(str, default_format, out parsed_time, null))
+            if (!TryParseTime(str, default_format, out var parsed_time, null))
             {
                 time = new DateTime(1, 1, 1);
                 return false;
@@ -245,10 +243,9 @@ namespace DateTimeRoutines
         /// <param name="default_format">format to be used preferably in ambivalent instances</param>
         /// <param name="date">parsed date output</param>
         /// <returns>true if date was found, else false</returns>
-        static public bool TryParseDate(this string str, DateTimeFormat default_format, out DateTime date)
+        public static bool TryParseDate(this string str, DateTimeFormat default_format, out DateTime date)
         {
-            ParsedDateTime parsed_date;
-            if (!TryParseDate(str, default_format, out parsed_date))
+            if (!TryParseDate(str, default_format, out ParsedDateTime parsed_date))
             {
                 date = new DateTime(1, 1, 1);
                 return false;
@@ -268,7 +265,7 @@ namespace DateTimeRoutines
         /// <param name="default_format">format to be used preferably in ambivalent instances</param>
         /// <param name="parsed_date_time">parsed date-time output</param>
         /// <returns>true if both date and time were found, else false</returns>
-        static public bool TryParseDateTime(this string str, DateTimeFormat default_format, out ParsedDateTime parsed_date_time)
+        public static bool TryParseDateTime(this string str, DateTimeFormat default_format, out ParsedDateTime parsed_date_time)
         {
             if (DateTimeRoutines.TryParseDateOrTime(str, default_format, out parsed_date_time)
                 && parsed_date_time.IsDateFound
@@ -288,7 +285,7 @@ namespace DateTimeRoutines
         /// <param name="default_format">format to be used preferably in ambivalent instances</param>
         /// <param name="parsed_time">parsed date-time output</param>
         /// <returns>true if time was found, else false</returns>
-        static public bool TryParseTime(this string str, DateTimeFormat default_format, out ParsedDateTime parsed_time)
+        public static bool TryParseTime(this string str, DateTimeFormat default_format, out ParsedDateTime parsed_time)
         {
             return TryParseTime(str, default_format, out parsed_time, null);
         }
@@ -302,30 +299,30 @@ namespace DateTimeRoutines
         /// <param name="default_format">format to be used preferably in ambivalent instances</param>
         /// <param name="parsed_date_time">parsed date-time output</param>
         /// <returns>true if date or time was found, else false</returns>
-        static public bool TryParseDateOrTime(this string str, DateTimeFormat default_format, out ParsedDateTime parsed_date_time)
+        public static bool TryParseDateOrTime(this string str, DateTimeFormat default_format, out ParsedDateTime parsed_date_time)
         {
             parsed_date_time = null;
 
-            ParsedDateTime parsed_date;
             ParsedDateTime parsed_time;
-            if (!TryParseDate(str, default_format, out parsed_date))
+            if (!TryParseDate(str, default_format, out
+            ParsedDateTime parsed_date))
             {
                 if (!TryParseTime(str, default_format, out parsed_time, null))
                     return false;
 
-                DateTime date_time = new DateTime(DefaultDate.Year, DefaultDate.Month, DefaultDate.Day, parsed_time.DateTime.Hour, parsed_time.DateTime.Minute, parsed_time.DateTime.Second);
+                var date_time = new DateTime(DefaultDate.Year, DefaultDate.Month, DefaultDate.Day, parsed_time.DateTime.Hour, parsed_time.DateTime.Minute, parsed_time.DateTime.Second);
                 parsed_date_time = new ParsedDateTime(-1, -1, parsed_time.IndexOfTime, parsed_time.LengthOfTime, date_time, parsed_time.UtcOffset);
             }
             else
             {
                 if (!TryParseTime(str, default_format, out parsed_time, parsed_date))
                 {
-                    DateTime date_time = new DateTime(parsed_date.DateTime.Year, parsed_date.DateTime.Month, parsed_date.DateTime.Day, 0, 0, 0);
+                    var date_time = new DateTime(parsed_date.DateTime.Year, parsed_date.DateTime.Month, parsed_date.DateTime.Day, 0, 0, 0);
                     parsed_date_time = new ParsedDateTime(parsed_date.IndexOfDate, parsed_date.LengthOfDate, -1, -1, date_time);
                 }
                 else
                 {
-                    DateTime date_time = new DateTime(parsed_date.DateTime.Year, parsed_date.DateTime.Month, parsed_date.DateTime.Day, parsed_time.DateTime.Hour, parsed_time.DateTime.Minute, parsed_time.DateTime.Second);
+                    var date_time = new DateTime(parsed_date.DateTime.Year, parsed_date.DateTime.Month, parsed_date.DateTime.Day, parsed_time.DateTime.Hour, parsed_time.DateTime.Minute, parsed_time.DateTime.Second);
                     parsed_date_time = new ParsedDateTime(parsed_date.IndexOfDate, parsed_date.LengthOfDate, parsed_time.IndexOfTime, parsed_time.LengthOfTime, date_time, parsed_time.UtcOffset);
                 }
             }
@@ -385,15 +382,15 @@ namespace DateTimeRoutines
 
             //try
             //{
-            int hour = int.Parse(m.Groups["hour"].Value);
+            var hour = int.Parse(m.Groups["hour"].Value);
             if (hour < 0 || hour > 23)
                 return false;
 
-            int minute = int.Parse(m.Groups["minute"].Value);
+            var minute = int.Parse(m.Groups["minute"].Value);
             if (minute < 0 || minute > 59)
                 return false;
 
-            int second = 0;
+            var second = 0;
             if (!string.IsNullOrEmpty(m.Groups["second"].Value))
             {
                 second = int.Parse(m.Groups["second"].Value);
@@ -406,15 +403,15 @@ namespace DateTimeRoutines
             else if (string.Compare(m.Groups["ampm"].Value, "AM", true) == 0 && hour == 12)
                 hour -= 12;
 
-            DateTime date_time = new DateTime(1, 1, 1, hour, minute, second);
+            var date_time = new DateTime(1, 1, 1, hour, minute, second);
 
             if (m.Groups["offset_hh"].Success)
             {
-                int offset_hh = int.Parse(m.Groups["offset_hh"].Value);
-                int offset_mm = 0;
+                var offset_hh = int.Parse(m.Groups["offset_hh"].Value);
+                var offset_mm = 0;
                 if (m.Groups["offset_mm"].Success)
                     offset_mm = int.Parse(m.Groups["offset_mm"].Value);
-                TimeSpan utc_offset = new TimeSpan(offset_hh, offset_mm, 0);
+                var utc_offset = new TimeSpan(offset_hh, offset_mm, 0);
                 if (m.Groups["offset_sign"].Value == "-")
                     utc_offset = -utc_offset;
                 parsed_time = new ParsedDateTime(-1, -1, m.Index, m.Length, date_time, utc_offset);
@@ -461,7 +458,7 @@ namespace DateTimeRoutines
         /// <param name="default_format">format to be used preferably in ambivalent instances</param>
         /// <param name="parsed_date">parsed date output</param>
         /// <returns>true if date was found, else false</returns>
-        static public bool TryParseDate(this string str, DateTimeFormat default_format, out ParsedDateTime parsed_date)
+        public static bool TryParseDate(this string str, DateTimeFormat default_format, out ParsedDateTime parsed_date)
         {
             parsed_date = null;
 
@@ -469,7 +466,7 @@ namespace DateTimeRoutines
                 return false;
 
             //look for dd/mm/yy
-            Match m = Regex.Match(str, @"(?<=^|[^\d])(?'day'\d{1,2})\s*(?'separator'[\\/\.])+\s*(?'month'\d{1,2})\s*\'separator'+\s*(?'year'\d{2}|\d{4})(?=$|[^\d])", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            var m = Regex.Match(str, @"(?<=^|[^\d])(?'day'\d{1,2})\s*(?'separator'[\\/\.])+\s*(?'month'\d{1,2})\s*\'separator'+\s*(?'year'\d{2}|\d{4})(?=$|[^\d])", RegexOptions.Compiled | RegexOptions.IgnoreCase);
             if (m.Success)
             {
                 DateTime date;
@@ -491,8 +488,7 @@ namespace DateTimeRoutines
             m = Regex.Match(str, @"(?<=^|[^\d])(?'year'\d{2}|\d{4})\s*(?'separator'[\-])\s*(?'month'\d{1,2})\s*\'separator'+\s*(?'day'\d{1,2})(?=$|[^\d])", RegexOptions.Compiled | RegexOptions.IgnoreCase);
             if (m.Success)
             {
-                DateTime date;
-                if (!convert_to_date(int.Parse(m.Groups["year"].Value), int.Parse(m.Groups["month"].Value), int.Parse(m.Groups["day"].Value), out date))
+                if (!convert_to_date(int.Parse(m.Groups["year"].Value), int.Parse(m.Groups["month"].Value), int.Parse(m.Groups["day"].Value), out var date))
                     return false;
                 parsed_date = new ParsedDateTime(m.Index, m.Length, -1, -1, date);
                 return true;
@@ -514,9 +510,9 @@ namespace DateTimeRoutines
                 m = Regex.Match(str, @"(?:^|[^\d\w])(?'month'Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[uarychilestmbro]*\s+(?'day'\d{1,2})(?:-?st|-?th|-?rd|-?nd)?(?:\s*,?\s*(?'year'\d{4}))?(?=$|[^\d\w])", RegexOptions.Compiled | RegexOptions.IgnoreCase);
             if (m.Success)
             {
-                int month = -1;
-                int index_of_date = m.Index;
-                int length_of_date = m.Length;
+                var month = -1;
+                var index_of_date = m.Index;
+                var length_of_date = m.Length;
 
                 switch (m.Groups["month"].Value)
                 {
@@ -575,8 +571,7 @@ namespace DateTimeRoutines
                 else
                     year = DefaultDate.Year;
 
-                DateTime date;
-                if (!convert_to_date(year, month, int.Parse(m.Groups["day"].Value), out date))
+                if (!convert_to_date(year, month, int.Parse(m.Groups["day"].Value), out var date))
                     return false;
                 parsed_date = new ParsedDateTime(index_of_date, length_of_date, -1, -1, date);
                 return true;
@@ -585,7 +580,7 @@ namespace DateTimeRoutines
             return false;
         }
 
-        static bool convert_to_date(int year, int month, int day, out DateTime date)
+        private static bool convert_to_date(int year, int month, int day, out DateTime date)
         {
             if (year >= 100)
             {
diff --git a/src/Jackett.Common/Helpers/WebUtilityHelpers.cs b/src/Jackett.Common/Helpers/WebUtilityHelpers.cs
index 2fceb3dd8..cdfe39d1f 100644
--- a/src/Jackett.Common/Helpers/WebUtilityHelpers.cs
+++ b/src/Jackett.Common/Helpers/WebUtilityHelpers.cs
@@ -12,7 +12,7 @@ namespace Jackett.Common.Helpers
                 return string.Empty;
             }
 
-            byte[] bytes = encoding.GetBytes(searchString);
+            var bytes = encoding.GetBytes(searchString);
             return encoding.GetString(WebUtility.UrlEncodeToBytes(bytes, 0, bytes.Length));
         }
 
diff --git a/src/Jackett.Common/Indexers/Abnormal.cs b/src/Jackett.Common/Indexers/Abnormal.cs
index 50066d3b8..4fb548524 100644
--- a/src/Jackett.Common/Indexers/Abnormal.cs
+++ b/src/Jackett.Common/Indexers/Abnormal.cs
@@ -38,7 +38,7 @@ namespace Jackett.Common.Indexers
         private bool CacheMode { get { return ConfigData.HardDriveCache.Value; } }
         private static string Directory => Path.Combine(Path.GetTempPath(), Assembly.GetExecutingAssembly().GetName().Name.ToLower(), MethodBase.GetCurrentMethod().DeclaringType?.Name.ToLower());
 
-        private Dictionary<string, string> emulatedBrowserHeaders = new Dictionary<string, string>();
+        private readonly Dictionary<string, string> emulatedBrowserHeaders = new Dictionary<string, string>();
         private CQ fDom = null;
 
         private ConfigurationDataAbnormal ConfigData
@@ -171,10 +171,10 @@ namespace Jackett.Common.Indexers
             {
                 // Parse error page
                 CQ dom = response.Content;
-                string message = dom[".warning"].Text().Split('.').Reverse().Skip(1).First();
+                var message = dom[".warning"].Text().Split('.').Reverse().Skip(1).First();
 
                 // Try left
-                string left = dom[".info"].Text().Trim();
+                var left = dom[".info"].Text().Trim();
 
                 // Oops, unable to login
                 output("-> Login failed: \"" + message + "\" and " + left + " tries left before being banned for 6 hours !", "error");
@@ -193,19 +193,19 @@ namespace Jackett.Common.Indexers
         /// <returns>Releases</returns>
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
-            TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
-            TimeSpan delta = new TimeSpan(1, 0, 0);
-            TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
+            var startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
+            var endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
+            var delta = new TimeSpan(1, 0, 0);
+            var adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
             TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
-            TimeZoneInfo FranceTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
+            var FranceTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
 
             var releases = new List<ReleaseInfo>();
             var torrentRowList = new List<CQ>();
             var searchTerm = query.GetQueryString();
             var searchUrl = SearchUrl;
-            int nbResults = 0;
-            int pageLinkCount = 0;
+            var nbResults = 0;
+            var pageLinkCount = 0;
 
             // Check cache first so we don't query the server (if search term used or not in dev mode)
             if (!DevMode && !string.IsNullOrEmpty(searchTerm))
@@ -237,7 +237,7 @@ namespace Jackett.Common.Indexers
                 torrentRowList.AddRange(firstPageRows.Select(fRow => fRow.Cq()));
 
                 // Check if there are pagination links at bottom
-                Boolean pagination = (fDom[".linkbox > a"].Length != 0);
+                var pagination = (fDom[".linkbox > a"].Length != 0);
 
                 // If pagination available
                 if (pagination)
@@ -271,7 +271,7 @@ namespace Jackett.Common.Indexers
                 if (!string.IsNullOrWhiteSpace(query.GetQueryString()) && pageLinkCount > 1)
                 {
                     // Starting with page #2
-                    for (int i = 2; i <= Math.Min(Int32.Parse(ConfigData.Pages.Value), pageLinkCount); i++)
+                    for (var i = 2; i <= Math.Min(int.Parse(ConfigData.Pages.Value), pageLinkCount); i++)
                     {
                         output("\nProcessing page #" + i);
 
@@ -293,44 +293,44 @@ namespace Jackett.Common.Indexers
                 }
 
                 // Loop on results
-                foreach (CQ tRow in torrentRowList)
+                foreach (var tRow in torrentRowList)
                 {
                     output("\n=>> Torrent #" + (releases.Count + 1));
 
                     // ID
-                    int id = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(1) > a").Attr("href").ToString(), @"\d+").Value);
+                    var id = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(1) > a").Attr("href").ToString(), @"\d+").Value);
                     output("ID: " + id);
 
                     // Release Name
-                    string name = tRow.Find("td:eq(1) > a").Text();
+                    var name = tRow.Find("td:eq(1) > a").Text();
                     //issue #3847 replace multi keyword
                     if (!string.IsNullOrEmpty(ReplaceMulti))
                     {
-                        System.Text.RegularExpressions.Regex regex = new Regex("(?i)([\\.\\- ])MULTI([\\.\\- ])");
+                        var regex = new Regex("(?i)([\\.\\- ])MULTI([\\.\\- ])");
                         name = regex.Replace(name, "$1" + ReplaceMulti + "$2");
                     }
                     output("Release: " + name);
 
                     // Category
-                    string categoryID = tRow.Find("td:eq(0) > a").Attr("href").Replace("torrents.php?cat[]=", String.Empty);
+                    var categoryID = tRow.Find("td:eq(0) > a").Attr("href").Replace("torrents.php?cat[]=", string.Empty);
                     var newznab = MapTrackerCatToNewznab(categoryID);
                     output("Category: " + MapTrackerCatToNewznab(categoryID).First().ToString() + " (" + categoryID + ")");
 
                     // Seeders
-                    int seeders = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(5)").Text(), @"\d+").Value);
+                    var seeders = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(5)").Text(), @"\d+").Value);
                     output("Seeders: " + seeders);
 
                     // Leechers
-                    int leechers = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(6)").Text(), @"\d+").Value);
+                    var leechers = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(6)").Text(), @"\d+").Value);
                     output("Leechers: " + leechers);
 
                     // Completed
-                    int completed = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(5)").Text(), @"\d+").Value);
+                    var completed = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(5)").Text(), @"\d+").Value);
                     output("Completed: " + completed);
 
                     // Size
-                    string sizeStr = tRow.Find("td:eq(4)").Text().Replace("Go", "gb").Replace("Mo", "mb").Replace("Ko", "kb");
-                    long size = ReleaseInfo.GetBytes(sizeStr);
+                    var sizeStr = tRow.Find("td:eq(4)").Text().Replace("Go", "gb").Replace("Mo", "mb").Replace("Ko", "kb");
+                    var size = ReleaseInfo.GetBytes(sizeStr);
                     output("Size: " + sizeStr + " (" + size + " bytes)");
 
                     // Publish DateToString
@@ -340,17 +340,17 @@ namespace Jackett.Common.Indexers
                     output("Released on: " + date);
 
                     // Torrent Details URL
-                    Uri detailsLink = new Uri(TorrentDescriptionUrl + id);
+                    var detailsLink = new Uri(TorrentDescriptionUrl + id);
                     output("Details: " + detailsLink.AbsoluteUri);
 
                     // Torrent Comments URL
-                    Uri commentsLink = new Uri(TorrentCommentUrl + id);
+                    var commentsLink = new Uri(TorrentCommentUrl + id);
                     output("Comments Link: " + commentsLink.AbsoluteUri);
 
                     // Torrent Download URL
                     Uri downloadLink = null;
-                    string link = tRow.Find("td:eq(3) > a").Attr("href");
-                    if (!String.IsNullOrEmpty(link))
+                    var link = tRow.Find("td:eq(3) > a").Attr("href");
+                    if (!string.IsNullOrEmpty(link))
                     {
                         // Download link available
                         downloadLink = new Uri(SiteLink + link);
@@ -364,7 +364,7 @@ namespace Jackett.Common.Indexers
                     }
 
                     // Freeleech
-                    int downloadVolumeFactor = 1;
+                    var downloadVolumeFactor = 1;
                     if (tRow.Find("img[alt=\"Freeleech\"]").Length >= 1)
                     {
                         downloadVolumeFactor = 0;
@@ -411,7 +411,7 @@ namespace Jackett.Common.Indexers
         private string buildQuery(string term, TorznabQuery query, string url, int page = 0)
         {
             var parameters = new NameValueCollection();
-            List<string> categoriesList = MapTorznabCapsToTrackers(query);
+            var categoriesList = MapTorznabCapsToTrackers(query);
             string categories = null;
 
             // Check if we are processing a new page
@@ -422,7 +422,7 @@ namespace Jackett.Common.Indexers
             }
 
             // Loop on Categories needed
-            foreach (string category in categoriesList)
+            foreach (var category in categoriesList)
             {
                 // If last, build !
                 if (categoriesList.Last() == category)
@@ -464,9 +464,9 @@ namespace Jackett.Common.Indexers
         /// </summary>
         /// <param name="request">URL created by Query Builder</param>
         /// <returns>Results from query</returns>
-        private async Task<String> queryExec(string request)
+        private async Task<string> queryExec(string request)
         {
-            String results = null;
+            string results = null;
 
             // Switch in we are in DEV mode with Hard Drive Cache or not
             if (DevMode && CacheMode)
@@ -487,9 +487,9 @@ namespace Jackett.Common.Indexers
         /// </summary>
         /// <param name="request">URL created by Query Builder</param>
         /// <returns>Results from query</returns>
-        private async Task<String> queryCache(string request)
+        private async Task<string> queryCache(string request)
         {
-            String results;
+            string results;
 
             // Create Directory if not exist
             System.IO.Directory.CreateDirectory(Directory);
@@ -498,10 +498,10 @@ namespace Jackett.Common.Indexers
             cleanCacheStorage();
 
             // File Name
-            string fileName = StringUtil.HashSHA1(request) + ".json";
+            var fileName = StringUtil.HashSHA1(request) + ".json";
 
             // Create fingerprint for request
-            string file = Path.Combine(Directory, fileName);
+            var file = Path.Combine(Directory, fileName);
 
             // Checking modes states
             if (File.Exists(file))
@@ -510,10 +510,10 @@ namespace Jackett.Common.Indexers
                 output("Loading results from hard drive cache ..." + fileName);
                 try
                 {
-                    using (StreamReader fileReader = File.OpenText(file))
+                    using (var fileReader = File.OpenText(file))
                     {
-                        JsonSerializer serializer = new JsonSerializer();
-                        results = (String)serializer.Deserialize(fileReader, typeof(String));
+                        var serializer = new JsonSerializer();
+                        results = (string)serializer.Deserialize(fileReader, typeof(string));
                     }
                 }
                 catch (Exception e)
@@ -529,9 +529,9 @@ namespace Jackett.Common.Indexers
 
                 // Cached file didn't exist for our query, writing it right now !
                 output("Writing results to hard drive cache ..." + fileName);
-                using (StreamWriter fileWriter = File.CreateText(file))
+                using (var fileWriter = File.CreateText(file))
                 {
-                    JsonSerializer serializer = new JsonSerializer();
+                    var serializer = new JsonSerializer();
                     serializer.Serialize(fileWriter, results);
                 }
             }
@@ -543,7 +543,7 @@ namespace Jackett.Common.Indexers
         /// </summary>
         /// <param name="request">URL created by Query Builder</param>
         /// <returns>Results from query</returns>
-        private async Task<String> queryTracker(string request)
+        private async Task<string> queryTracker(string request)
         {
             WebClientStringResult results = null;
 
@@ -621,7 +621,7 @@ namespace Jackett.Common.Indexers
             {
                 // Generate a random value in our range
                 var random = new Random(DateTime.Now.Millisecond);
-                int waiting = random.Next(Convert.ToInt32(ConfigData.LatencyStart.Value), Convert.ToInt32(ConfigData.LatencyEnd.Value));
+                var waiting = random.Next(Convert.ToInt32(ConfigData.LatencyStart.Value), Convert.ToInt32(ConfigData.LatencyEnd.Value));
                 output("\nLatency Faker => Sleeping for " + waiting + " ms...");
 
                 // Sleep now...
diff --git a/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs b/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs
index 594904d44..53270e94c 100644
--- a/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs
+++ b/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs
@@ -17,7 +17,7 @@ namespace Jackett.Common.Indexers.Abstract
         protected string endpoint;
         protected string APIUrl { get { return SiteLink + endpoint; } }
 
-        new ConfigurationDataUserPasskey configData
+        private new ConfigurationDataUserPasskey configData
         {
             get { return (ConfigurationDataUserPasskey)base.configData; }
             set { base.configData = value; }
diff --git a/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs b/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs
index 887af2fae..d09d0a375 100644
--- a/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs
+++ b/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs
@@ -27,7 +27,7 @@ namespace Jackett.Common.Indexers.Abstract
         protected bool supportsCategories = true; // set to false if the tracker doesn't include the categories in the API search results
         protected bool useTokens = false;
 
-        new ConfigurationDataBasicLogin configData
+        private new ConfigurationDataBasicLogin configData
         {
             get { return (ConfigurationDataBasicLogin)base.configData; }
             set { base.configData = value; }
@@ -115,7 +115,7 @@ namespace Jackett.Common.Indexers.Abstract
 
             if (!string.IsNullOrWhiteSpace(query.ImdbID))
             {
-                if (this.imdbInTags)
+                if (imdbInTags)
                     queryCollection.Add("taglist", query.ImdbID);
                 else
                     queryCollection.Add("cataloguenumber", query.ImdbID);
@@ -202,7 +202,7 @@ namespace Jackett.Common.Indexers.Abstract
                     {
                         foreach (JObject torrent in r["torrents"])
                         {
-                            ReleaseInfo release2 = (ReleaseInfo)release.Clone();
+                            var release2 = (ReleaseInfo)release.Clone();
                             FillReleaseInfoFromJson(release2, torrent);
                             if (ReleaseInfoPostParse(release2, torrent, r))
                                 releases.Add(release2);
@@ -230,7 +230,7 @@ namespace Jackett.Common.Indexers.Abstract
             return true;
         }
 
-        void FillReleaseInfoFromJson(ReleaseInfo release, JObject torrent)
+        private void FillReleaseInfoFromJson(ReleaseInfo release, JObject torrent)
         {
             var torrentId = torrent["torrentId"];
 
diff --git a/src/Jackett.Common/Indexers/AniDub.cs b/src/Jackett.Common/Indexers/AniDub.cs
index 6f723d6a8..0dc1b1ab2 100644
--- a/src/Jackett.Common/Indexers/AniDub.cs
+++ b/src/Jackett.Common/Indexers/AniDub.cs
@@ -528,7 +528,7 @@ namespace Jackett.Common.Indexers
 
         private IEnumerable<int> ParseCategories(Uri showUri)
         {
-            Dictionary<string, string> categoriesMap = CategoriesMap;
+            var categoriesMap = CategoriesMap;
 
             var path = showUri.AbsolutePath.ToLowerInvariant();
 
diff --git a/src/Jackett.Common/Indexers/Anidex.cs b/src/Jackett.Common/Indexers/Anidex.cs
index 2f26da13f..1f43fc261 100644
--- a/src/Jackett.Common/Indexers/Anidex.cs
+++ b/src/Jackett.Common/Indexers/Anidex.cs
@@ -87,7 +87,8 @@ namespace Jackett.Common.Indexers
                 {"29", "Spanish (LATAM)" },
                 {"30", "Persian"},
                 {"31", "Malaysian"}
-            }) { Name = "Language", Value = "1" };
+            })
+            { Name = "Language", Value = "1" };
             configData.AddDynamic("languageid", languageSelect);
 
             // Configure the sort selects
@@ -97,7 +98,8 @@ namespace Jackett.Common.Indexers
                 {"seeders", "seeders"},
                 {"size", "size"},
                 {"filename", "title"}
-            }) { Name = "Sort by", Value = "upload_timestamp" };
+            })
+            { Name = "Sort by", Value = "upload_timestamp" };
             configData.AddDynamic("sortrequestedfromsite", sortBySelect);
 
             var orderSelect = new SelectItem(new Dictionary<string, string>()
diff --git a/src/Jackett.Common/Indexers/AnimeBytes.cs b/src/Jackett.Common/Indexers/AnimeBytes.cs
index e00495c40..be2f15265 100644
--- a/src/Jackett.Common/Indexers/AnimeBytes.cs
+++ b/src/Jackett.Common/Indexers/AnimeBytes.cs
@@ -228,12 +228,12 @@ namespace Jackett.Common.Indexers
                             if (!string.IsNullOrWhiteSpace(EditionTitle))
                                 releaseInfo = WebUtility.HtmlDecode(EditionTitle);
 
-                            Regex SeasonRegEx = new Regex(@"Season (\d+)", RegexOptions.Compiled);
+                            var SeasonRegEx = new Regex(@"Season (\d+)", RegexOptions.Compiled);
                             var SeasonRegExMatch = SeasonRegEx.Match(releaseInfo);
                             if (SeasonRegExMatch.Success)
                                 season = ParseUtil.CoerceInt(SeasonRegExMatch.Groups[1].Value);
 
-                            Regex EpisodeRegEx = new Regex(@"Episode (\d+)", RegexOptions.Compiled);
+                            var EpisodeRegEx = new Regex(@"Episode (\d+)", RegexOptions.Compiled);
                             var EpisodeRegExMatch = EpisodeRegEx.Match(releaseInfo);
                             if (EpisodeRegExMatch.Success)
                                 episode = EpisodeRegExMatch.Groups[1].Value;
@@ -242,7 +242,7 @@ namespace Jackett.Common.Indexers
                             releaseInfo = releaseInfo.Replace("Season ", "S");
                             releaseInfo = releaseInfo.Trim();
 
-                            if (PadEpisode && int.TryParse(releaseInfo, out int test) && releaseInfo.Length == 1)
+                            if (PadEpisode && int.TryParse(releaseInfo, out var test) && releaseInfo.Length == 1)
                             {
                                 releaseInfo = "0" + releaseInfo;
                             }
@@ -322,7 +322,7 @@ namespace Jackett.Common.Indexers
 
                             // We dont actually have a release name >.> so try to create one
                             var releaseTags = Property.Split("|".ToCharArray(), StringSplitOptions.RemoveEmptyEntries).ToList();
-                            for (int i = releaseTags.Count - 1; i >= 0; i--)
+                            for (var i = releaseTags.Count - 1; i >= 0; i--)
                             {
                                 releaseTags[i] = releaseTags[i].Trim();
                                 if (string.IsNullOrWhiteSpace(releaseTags[i]))
diff --git a/src/Jackett.Common/Indexers/AnimeTorrents.cs b/src/Jackett.Common/Indexers/AnimeTorrents.cs
index 609c8b76c..2bda7aaac 100644
--- a/src/Jackett.Common/Indexers/AnimeTorrents.cs
+++ b/src/Jackett.Common/Indexers/AnimeTorrents.cs
@@ -94,7 +94,7 @@ namespace Jackett.Common.Indexers
             var searchString = query.GetQueryString();
 
             //  replace any space, special char, etc. with % (wildcard)
-            Regex ReplaceRegex = new Regex("[^a-zA-Z0-9]+");
+            var ReplaceRegex = new Regex("[^a-zA-Z0-9]+");
             searchString = ReplaceRegex.Replace(searchString, "%");
 
             var searchUrl = SearchUrl;
diff --git a/src/Jackett.Common/Indexers/BB.cs b/src/Jackett.Common/Indexers/BB.cs
index dca37debf..4657bb6db 100644
--- a/src/Jackett.Common/Indexers/BB.cs
+++ b/src/Jackett.Common/Indexers/BB.cs
@@ -91,15 +91,15 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
-            List<string> searchStrings = new List<string>(new string[] { query.GetQueryString() });
+            var releases = new List<ReleaseInfo>();
+            var searchStrings = new List<string>(new string[] { query.GetQueryString() });
 
             if (string.IsNullOrEmpty(query.Episode) && (query.Season > 0))
                 // Tracker naming rules: If query is for a whole season, "Season #" instead of "S##".
                 searchStrings.Add((query.SanitizedSearchTerm + " " + string.Format("\"Season {0}\"", query.Season)).Trim());
 
-            List<string> categories = MapTorznabCapsToTrackers(query);
-            List<string> request_urls = new List<string>();
+            var categories = MapTorznabCapsToTrackers(query);
+            var request_urls = new List<string>();
 
             foreach (var searchString in searchStrings)
             {
@@ -118,12 +118,12 @@ namespace Jackett.Common.Indexers
 
                 request_urls.Add(SearchUrl + queryCollection.GetQueryString());
             }
-            IEnumerable<Task<WebClientStringResult>> downloadTasksQuery =
+            var downloadTasksQuery =
                 from url in request_urls select RequestStringWithCookiesAndRetry(url);
 
-            WebClientStringResult[] responses = await Task.WhenAll(downloadTasksQuery.ToArray());
+            var responses = await Task.WhenAll(downloadTasksQuery.ToArray());
 
-            for (int i = 0; i < searchStrings.Count(); i++)
+            for (var i = 0; i < searchStrings.Count(); i++)
             {
                 var results = responses[i];
                 // Occasionally the cookies become invalid, login again if that happens
@@ -138,7 +138,7 @@ namespace Jackett.Common.Indexers
                     var rows = dom["#torrent_table > tbody > tr.torrent"];
                     foreach (var row in rows)
                     {
-                        CQ qRow = row.Cq();
+                        var qRow = row.Cq();
                         var release = new ReleaseInfo();
 
                         release.MinimumRatio = 1;
@@ -183,7 +183,7 @@ namespace Jackett.Common.Indexers
 
                         if (catStr == "10") //change "Season #" to "S##" for TV shows
                             release.Title = Regex.Replace(release.Title, @"Season (\d+)",
-                                                          m => string.Format("S{0:00}", Int32.Parse(m.Groups[1].Value)));
+                                                          m => string.Format("S{0:00}", int.Parse(m.Groups[1].Value)));
 
                         releases.Add(release);
                     }
diff --git a/src/Jackett.Common/Indexers/BJShare.cs b/src/Jackett.Common/Indexers/BJShare.cs
index ea81c6a1e..dc16641df 100644
--- a/src/Jackett.Common/Indexers/BJShare.cs
+++ b/src/Jackett.Common/Indexers/BJShare.cs
@@ -118,7 +118,7 @@ namespace Jackett.Common.Indexers
         private string InternationalTitle(string title)
         {
             // Get international title if available, or use the full title if not
-            string cleanTitle = Regex.Replace(title, @".* \[(.*?)\](.*)", "$1$2");
+            var cleanTitle = Regex.Replace(title, @".* \[(.*?)\](.*)", "$1$2");
             cleanTitle = Regex.Replace(cleanTitle, @"(?:.*)\/(.*)", "$1");
 
             return cleanTitle.Trim();
@@ -494,15 +494,15 @@ namespace Jackett.Common.Indexers
                             // Adjust the description in order to can be read by Radarr and Sonarr
 
                             var cleanDescription = release.Description.Trim().TrimStart('[').TrimEnd(']');
-                            String[] titleElements;
+                            string[] titleElements;
 
                             //Formats the title so it can be parsed later
-                            string[] stringSeparators = new string[] { " / " };
+                            var stringSeparators = new string[] { " / " };
                             titleElements = cleanDescription.Split(stringSeparators, StringSplitOptions.None);
                             // release.Title += string.Join(" ", titleElements);
                             release.Title = release.Title.Trim();
 
-                            release.Title += " " + titleElements[5] + " " + titleElements[3] + " " + titleElements[1] + " " + titleElements[2] + " " + titleElements[4] + " " + String.Join(" ", titleElements.Skip(6).Take(titleElements.Length - 6).ToArray());
+                            release.Title += " " + titleElements[5] + " " + titleElements[3] + " " + titleElements[1] + " " + titleElements[2] + " " + titleElements[4] + " " + string.Join(" ", titleElements.Skip(6).Take(titleElements.Length - 6).ToArray());
 
                             // This tracker does not provide an publish date to search terms (only on last 24h page)
                             release.PublishDate = DateTime.Today;
diff --git a/src/Jackett.Common/Indexers/BakaBT.cs b/src/Jackett.Common/Indexers/BakaBT.cs
index a52d8b782..409633e4f 100644
--- a/src/Jackett.Common/Indexers/BakaBT.cs
+++ b/src/Jackett.Common/Indexers/BakaBT.cs
@@ -18,7 +18,7 @@ namespace Jackett.Common.Indexers
     {
         private string SearchUrl => SiteLink + "browse.php?only=0&hentai=1&incomplete=1&lossless=1&hd=1&multiaudio=1&bonus=1&reorder=1&q=";
         private string LoginUrl => SiteLink + "login.php";
-        private string LogoutStr = "<a href=\"logout.php\">Logout</a>";
+        private readonly string LogoutStr = "<a href=\"logout.php\">Logout</a>";
 
         private new ConfigurationDataBasicLogin configData
         {
diff --git a/src/Jackett.Common/Indexers/BaseIndexer.cs b/src/Jackett.Common/Indexers/BaseIndexer.cs
index e46fbfeda..77842f3c2 100644
--- a/src/Jackett.Common/Indexers/BaseIndexer.cs
+++ b/src/Jackett.Common/Indexers/BaseIndexer.cs
@@ -54,7 +54,7 @@ namespace Jackett.Common.Indexers
             get { return configData.LastError.Value; }
             set
             {
-                bool SaveNeeded = configData.LastError.Value != value && IsConfigured;
+                var SaveNeeded = configData.LastError.Value != value && IsConfigured;
                 configData.LastError.Value = value;
                 if (SaveNeeded)
                     SaveConfig();
@@ -100,7 +100,7 @@ namespace Jackett.Common.Indexers
 
         protected void LoadLegacyCookieConfig(JToken jsonConfig)
         {
-            string legacyCookieHeader = (string)jsonConfig["cookie_header"];
+            var legacyCookieHeader = (string)jsonConfig["cookie_header"];
             if (!string.IsNullOrEmpty(legacyCookieHeader))
             {
                 CookieHeader = legacyCookieHeader;
@@ -113,7 +113,7 @@ namespace Jackett.Common.Indexers
                 {
                     var array = (JArray)jcookies;
                     legacyCookieHeader = string.Empty;
-                    for (int i = 0; i < array.Count; i++)
+                    for (var i = 0; i < array.Count; i++)
                     {
                         if (i != 0)
                             legacyCookieHeader += "; ";
@@ -128,7 +128,7 @@ namespace Jackett.Common.Indexers
             }
         }
 
-        virtual public void LoadValuesFromJson(JToken jsonConfig, bool useProtectionService = false)
+        public virtual void LoadValuesFromJson(JToken jsonConfig, bool useProtectionService = false)
         {
             IProtectionService ps = null;
             if (useProtectionService)
@@ -165,7 +165,7 @@ namespace Jackett.Common.Indexers
                 }
             }
             // read and upgrade old settings file format
-            else if (jsonConfig is Object)
+            else if (jsonConfig is object)
             {
                 LoadLegacyCookieConfig(jsonConfig);
                 SaveConfig();
@@ -176,7 +176,7 @@ namespace Jackett.Common.Indexers
         //TODO: Remove this section once users have moved off DPAPI
         private bool MigratedFromDPAPI(JToken jsonConfig)
         {
-            bool isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
+            var isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
 
             if (!isWindows && DotNetCoreUtil.IsRunningOnDotNetCore)
             {
@@ -187,7 +187,7 @@ namespace Jackett.Common.Indexers
             LoadValuesFromJson(jsonConfig, false);
 
             StringItem passwordPropertyValue = null;
-            string passwordValue = "";
+            var passwordValue = "";
 
             try
             {
@@ -233,7 +233,7 @@ namespace Jackett.Common.Indexers
 
                     try
                     {
-                        string unprotectedPassword = protectionService.LegacyUnProtect(passwordValue);
+                        var unprotectedPassword = protectionService.LegacyUnProtect(passwordValue);
                         //Password successfully unprotected using Windows/Mono DPAPI
 
                         passwordPropertyValue.Value = unprotectedPassword;
@@ -362,8 +362,8 @@ namespace Jackett.Common.Indexers
         protected BaseWebIndexer(string name, string link, string description, IIndexerConfigurationService configService, WebClient client, Logger logger, ConfigurationData configData, IProtectionService p, TorznabCapabilities caps = null, string downloadBase = null)
             : base(name, link, description, configService, logger, configData, p)
         {
-            this.webclient = client;
-            this.downloadUrlBase = downloadBase;
+            webclient = client;
+            downloadUrlBase = downloadBase;
 
             if (caps == null)
                 caps = TorznabUtil.CreateDefaultTorznabTVCaps();
@@ -374,10 +374,10 @@ namespace Jackett.Common.Indexers
         protected BaseWebIndexer(IIndexerConfigurationService configService, WebClient client, Logger logger, IProtectionService p)
             : base("", "/", "", configService, logger, null, p)
         {
-            this.webclient = client;
+            webclient = client;
         }
 
-        public async virtual Task<byte[]> Download(Uri link)
+        public virtual async Task<byte[]> Download(Uri link)
         {
             var uncleanLink = UncleanLink(link);
             return await Download(uncleanLink, RequestType.GET);
@@ -405,7 +405,7 @@ namespace Jackett.Common.Indexers
             }
             if (response.Status != System.Net.HttpStatusCode.OK && response.Status != System.Net.HttpStatusCode.Continue && response.Status != System.Net.HttpStatusCode.PartialContent)
             {
-                logger.Error("Failed download cookies: " + this.CookieHeader);
+                logger.Error("Failed download cookies: " + CookieHeader);
                 if (response.Content != null)
                     logger.Error("Failed download response:\n" + Encoding.UTF8.GetString(response.Content));
                 throw new Exception($"Remote server returned {response.Status.ToString()}" + (response.IsRedirect ? " => " + response.RedirectingTo : ""));
@@ -417,7 +417,7 @@ namespace Jackett.Common.Indexers
         protected async Task<WebClientByteResult> RequestBytesWithCookiesAndRetry(string url, string cookieOverride = null, RequestType method = RequestType.GET, string referer = null, IEnumerable<KeyValuePair<string, string>> data = null)
         {
             Exception lastException = null;
-            for (int i = 0; i < 3; i++)
+            for (var i = 0; i < 3; i++)
             {
                 try
                 {
@@ -448,7 +448,7 @@ namespace Jackett.Common.Indexers
 
             if (cookieOverride != null)
                 request.Cookies = cookieOverride;
-            WebClientStringResult result = await webclient.GetString(request);
+            var result = await webclient.GetString(request);
             CheckTrackerDown(result);
             UpdateCookieHeader(result.Cookies, cookieOverride);
             return result;
@@ -457,7 +457,7 @@ namespace Jackett.Common.Indexers
         protected async Task<WebClientStringResult> RequestStringWithCookiesAndRetry(string url, string cookieOverride = null, string referer = null, Dictionary<string, string> headers = null)
         {
             Exception lastException = null;
-            for (int i = 0; i < 3; i++)
+            for (var i = 0; i < 3; i++)
             {
                 try
                 {
@@ -510,7 +510,7 @@ namespace Jackett.Common.Indexers
 
             if (emulateBrowser.HasValue)
                 request.EmulateBrowser = emulateBrowser.Value;
-            WebClientStringResult result = await webclient.GetString(request);
+            var result = await webclient.GetString(request);
             CheckTrackerDown(result);
             UpdateCookieHeader(result.Cookies, cookieOverride);
             return result;
@@ -519,7 +519,7 @@ namespace Jackett.Common.Indexers
         protected async Task<WebClientStringResult> PostDataWithCookiesAndRetry(string url, IEnumerable<KeyValuePair<string, string>> data, string cookieOverride = null, string referer = null, Dictionary<string, string> headers = null, string rawbody = null, bool? emulateBrowser = null)
         {
             Exception lastException = null;
-            for (int i = 0; i < 3; i++)
+            for (var i = 0; i < 3; i++)
             {
                 try
                 {
@@ -599,7 +599,7 @@ namespace Jackett.Common.Indexers
         protected async Task FollowIfRedirect(WebClientByteResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
         {
             // Follow up  to 5 redirects
-            for (int i = 0; i < 5; i++)
+            for (var i = 0; i < 5; i++)
             {
                 if (!response.IsRedirect)
                     break;
@@ -616,11 +616,11 @@ namespace Jackett.Common.Indexers
             }
         }
 
-        private String ResolveCookies(String incomingCookies = "")
+        private string ResolveCookies(string incomingCookies = "")
         {
             var redirRequestCookies = (CookieHeader != null && CookieHeader != "" ? CookieHeader + " " : "") + incomingCookies;
-            System.Text.RegularExpressions.Regex expression = new System.Text.RegularExpressions.Regex(@"([^\\,;\s]+)=([^=\\,;\s]*)");
-            Dictionary<string, string> cookieDIctionary = new Dictionary<string, string>();
+            var expression = new System.Text.RegularExpressions.Regex(@"([^\\,;\s]+)=([^=\\,;\s]*)");
+            var cookieDIctionary = new Dictionary<string, string>();
             var matches = expression.Match(redirRequestCookies);
             while (matches.Success)
             {
@@ -636,7 +636,7 @@ namespace Jackett.Common.Indexers
         // Update CookieHeader with new cookies and save the config if something changed (e.g. a new CloudFlare clearance cookie was issued)
         protected virtual void UpdateCookieHeader(string newCookies, string cookieOverride = null)
         {
-            string newCookieHeader = ResolveCookies((cookieOverride != null && cookieOverride != "" ? cookieOverride + " " : "") + newCookies);
+            var newCookieHeader = ResolveCookies((cookieOverride != null && cookieOverride != "" ? cookieOverride + " " : "") + newCookies);
             if (CookieHeader != newCookieHeader)
             {
                 logger.Debug(string.Format("updating Cookies {0} => {1}", CookieHeader, newCookieHeader));
@@ -851,7 +851,7 @@ namespace Jackett.Common.Indexers
 
         public override TorznabCapabilities TorznabCaps { get; protected set; }
 
-        private List<CategoryMapping> categoryMapping = new List<CategoryMapping>();
+        private readonly List<CategoryMapping> categoryMapping = new List<CategoryMapping>();
         protected WebClient webclient;
         protected readonly string downloadUrlBase = "";
     }
diff --git a/src/Jackett.Common/Indexers/BitCityReloaded.cs b/src/Jackett.Common/Indexers/BitCityReloaded.cs
index 8b265d944..86da34ff8 100644
--- a/src/Jackett.Common/Indexers/BitCityReloaded.cs
+++ b/src/Jackett.Common/Indexers/BitCityReloaded.cs
@@ -19,7 +19,7 @@ namespace Jackett.Common.Indexers
     {
         private string LoginUrl { get { return SiteLink + "login/index.php"; } }
         private string BrowseUrl { get { return SiteLink + "uebersicht.php"; } }
-        private TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "W. Europe Standard Time", "W. Europe Standard Time");
+        private readonly TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "W. Europe Standard Time", "W. Europe Standard Time");
 
         private new ConfigurationDataBasicLoginWithRSSAndDisplay configData
         {
@@ -42,8 +42,8 @@ namespace Jackett.Common.Indexers
             Language = "de-de";
             Type = "private";
 
-            this.configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show a reasonable amount (it looks like there's no maximum).";
-            this.configData.DisplayText.Name = "Notice";
+            configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show a reasonable amount (it looks like there's no maximum).";
+            configData.DisplayText.Name = "Notice";
 
             AddCategoryMapping(1, TorznabCatType.Other); // Anderes
             AddCategoryMapping(2, TorznabCatType.TVAnime); // Anime
@@ -144,7 +144,7 @@ namespace Jackett.Common.Indexers
 
                     var qRow = row.Cq();
                     var flagImgs = qRow.Find("table tbody tr: eq(0) td > img");
-                    List<string> flags = new List<string>();
+                    var flags = new List<string>();
                     flagImgs.Each(flagImg =>
                     {
                         var flag = flagImg.GetAttribute("src").Replace("pic/torrent_", "").Replace(".gif", "").ToUpper();
@@ -163,12 +163,12 @@ namespace Jackett.Common.Indexers
                     if (!query.MatchQueryStringAND(release.Title))
                         continue;
 
-                    release.Description = String.Join(", ", flags);
+                    release.Description = string.Join(", ", flags);
                     release.Guid = release.Link;
 
                     var dateStr = qRow.Find("table tbody tr:eq(1) td:eq(4)").Html().Replace("&nbsp;", " ").Trim();
                     var dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yyyy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
-                    DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
+                    var pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
                     release.PublishDate = pubDateUtc.ToLocalTime();
 
                     var sizeStr = qRow.Find("table tbody tr:eq(1) td b").First().Text().Trim();
diff --git a/src/Jackett.Common/Indexers/BitHdtv.cs b/src/Jackett.Common/Indexers/BitHdtv.cs
index ffff225dc..5073d9cf9 100644
--- a/src/Jackett.Common/Indexers/BitHdtv.cs
+++ b/src/Jackett.Common/Indexers/BitHdtv.cs
@@ -60,8 +60,8 @@ namespace Jackett.Common.Indexers
         {
             var loginPage = await RequestStringWithCookies(LoginUrl, configData.CookieHeader.Value);
             CQ cq = loginPage.Content;
-            string recaptchaSiteKey = cq.Find(".g-recaptcha").Attr("data-sitekey");
-            var result = this.configData;
+            var recaptchaSiteKey = cq.Find(".g-recaptcha").Attr("data-sitekey");
+            var result = configData;
             result.CookieHeader.Value = loginPage.Cookies;
             result.Captcha.SiteKey = recaptchaSiteKey;
             result.Captcha.Version = "2";
diff --git a/src/Jackett.Common/Indexers/BroadcastTheNet.cs b/src/Jackett.Common/Indexers/BroadcastTheNet.cs
index 460abd925..44303a0cf 100644
--- a/src/Jackett.Common/Indexers/BroadcastTheNet.cs
+++ b/src/Jackett.Common/Indexers/BroadcastTheNet.cs
@@ -18,7 +18,7 @@ namespace Jackett.Common.Indexers
     public class BroadcastTheNet : BaseWebIndexer
     {
         // Docs at http://apidocs.broadcasthe.net/docs.php
-        private string APIBASE = "https://api.broadcasthe.net";
+        private readonly string APIBASE = "https://api.broadcasthe.net";
 
         private new ConfigurationDataAPIKey configData
         {
diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs
index b1e791d9e..6b86e1940 100644
--- a/src/Jackett.Common/Indexers/CardigannIndexer.cs
+++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs
@@ -33,9 +33,9 @@ namespace Jackett.Common.Indexers
 
         protected List<string> DefaultCategories = new List<string>();
 
-        new ConfigurationData configData
+        private new ConfigurationData configData
         {
-            get { return (ConfigurationData)base.configData; }
+            get { return base.configData; }
             set { base.configData = value; }
         }
 
@@ -196,10 +196,10 @@ namespace Jackett.Common.Indexers
 
         protected Dictionary<string, object> getTemplateVariablesFromConfigData()
         {
-            Dictionary<string, object> variables = new Dictionary<string, object>();
+            var variables = new Dictionary<string, object>();
 
             variables[".Config.sitelink"] = SiteLink;
-            foreach (settingsField Setting in Definition.Settings)
+            foreach (var Setting in Definition.Settings)
             {
                 string value;
                 var item = configData.GetDynamic(Setting.Name);
@@ -232,17 +232,17 @@ namespace Jackett.Common.Indexers
 
             // handle re_replace expression
             // Example: {{ re_replace .Query.Keywords "[^a-zA-Z0-9]+" "%" }}
-            Regex ReReplaceRegex = new Regex(@"{{\s*re_replace\s+(\..+?)\s+""(.*?)""\s+""(.*?)""\s*}}");
+            var ReReplaceRegex = new Regex(@"{{\s*re_replace\s+(\..+?)\s+""(.*?)""\s+""(.*?)""\s*}}");
             var ReReplaceRegexMatches = ReReplaceRegex.Match(template);
 
             while (ReReplaceRegexMatches.Success)
             {
-                string all = ReReplaceRegexMatches.Groups[0].Value;
-                string variable = ReReplaceRegexMatches.Groups[1].Value;
-                string regexp = ReReplaceRegexMatches.Groups[2].Value;
-                string newvalue = ReReplaceRegexMatches.Groups[3].Value;
+                var all = ReReplaceRegexMatches.Groups[0].Value;
+                var variable = ReReplaceRegexMatches.Groups[1].Value;
+                var regexp = ReReplaceRegexMatches.Groups[2].Value;
+                var newvalue = ReReplaceRegexMatches.Groups[3].Value;
 
-                Regex ReplaceRegex = new Regex(regexp);
+                var ReplaceRegex = new Regex(regexp);
                 var input = (string)variables[variable];
                 var expanded = ReplaceRegex.Replace(input, newvalue);
 
@@ -255,14 +255,14 @@ namespace Jackett.Common.Indexers
 
             // handle join expression
             // Example: {{ join .Categories "," }}
-            Regex JoinRegex = new Regex(@"{{\s*join\s+(\..+?)\s+""(.*?)""\s*}}");
+            var JoinRegex = new Regex(@"{{\s*join\s+(\..+?)\s+""(.*?)""\s*}}");
             var JoinMatches = JoinRegex.Match(template);
 
             while (JoinMatches.Success)
             {
-                string all = JoinMatches.Groups[0].Value;
-                string variable = JoinMatches.Groups[1].Value;
-                string delimiter = JoinMatches.Groups[2].Value;
+                var all = JoinMatches.Groups[0].Value;
+                var variable = JoinMatches.Groups[1].Value;
+                var delimiter = JoinMatches.Groups[2].Value;
 
                 var input = (ICollection<string>)variables[variable];
                 var expanded = string.Join(delimiter, input);
@@ -275,17 +275,17 @@ namespace Jackett.Common.Indexers
             }
 
             // handle or, and functions
-            Regex AndOrRegex = new Regex(@"(and|or)\s+\((\..+?)\)\s+\((\..+?)\)(\s+\((\..+?)\)){0,1}");
+            var AndOrRegex = new Regex(@"(and|or)\s+\((\..+?)\)\s+\((\..+?)\)(\s+\((\..+?)\)){0,1}");
             var AndOrRegexMatches = AndOrRegex.Match(template);
 
             while (AndOrRegexMatches.Success)
             {
-                string functionResult = "";
-                string all = AndOrRegexMatches.Groups[0].Value;
-                string op = AndOrRegexMatches.Groups[1].Value;
-                string first = AndOrRegexMatches.Groups[2].Value;
-                string second = AndOrRegexMatches.Groups[3].Value;
-                string third = "";
+                var functionResult = "";
+                var all = AndOrRegexMatches.Groups[0].Value;
+                var op = AndOrRegexMatches.Groups[1].Value;
+                var first = AndOrRegexMatches.Groups[2].Value;
+                var second = AndOrRegexMatches.Groups[3].Value;
+                var third = "";
                 if (AndOrRegexMatches.Groups.Count > 5)
                 {
                     third = AndOrRegexMatches.Groups[5].Value;
@@ -334,17 +334,17 @@ namespace Jackett.Common.Indexers
             }
 
             // handle if ... else ... expression
-            Regex IfElseRegex = new Regex(@"{{\s*if\s*(.+?)\s*}}(.*?){{\s*else\s*}}(.*?){{\s*end\s*}}");
+            var IfElseRegex = new Regex(@"{{\s*if\s*(.+?)\s*}}(.*?){{\s*else\s*}}(.*?){{\s*end\s*}}");
             var IfElseRegexMatches = IfElseRegex.Match(template);
 
             while (IfElseRegexMatches.Success)
             {
                 string conditionResult = null;
 
-                string all = IfElseRegexMatches.Groups[0].Value;
-                string condition = IfElseRegexMatches.Groups[1].Value;
-                string onTrue = IfElseRegexMatches.Groups[2].Value;
-                string onFalse = IfElseRegexMatches.Groups[3].Value;
+                var all = IfElseRegexMatches.Groups[0].Value;
+                var condition = IfElseRegexMatches.Groups[1].Value;
+                var onTrue = IfElseRegexMatches.Groups[2].Value;
+                var onFalse = IfElseRegexMatches.Groups[3].Value;
 
                 if (condition.StartsWith("."))
                 {
@@ -378,19 +378,19 @@ namespace Jackett.Common.Indexers
             }
 
             // handle range expression
-            Regex RangeRegex = new Regex(@"{{\s*range\s*(.+?)\s*}}(.*?){{\.}}(.*?){{end}}");
+            var RangeRegex = new Regex(@"{{\s*range\s*(.+?)\s*}}(.*?){{\.}}(.*?){{end}}");
             var RangeRegexMatches = RangeRegex.Match(template);
 
             while (RangeRegexMatches.Success)
             {
-                string expanded = string.Empty;
+                var expanded = string.Empty;
 
-                string all = RangeRegexMatches.Groups[0].Value;
-                string variable = RangeRegexMatches.Groups[1].Value;
-                string prefix = RangeRegexMatches.Groups[2].Value;
-                string postfix = RangeRegexMatches.Groups[3].Value;
+                var all = RangeRegexMatches.Groups[0].Value;
+                var variable = RangeRegexMatches.Groups[1].Value;
+                var prefix = RangeRegexMatches.Groups[2].Value;
+                var postfix = RangeRegexMatches.Groups[3].Value;
 
-                foreach (string value in (ICollection<string>)variables[variable])
+                foreach (var value in (ICollection<string>)variables[variable])
                 {
                     var newvalue = value;
                     if (modifier != null)
@@ -402,17 +402,17 @@ namespace Jackett.Common.Indexers
             }
 
             // handle simple variables
-            Regex VariablesRegEx = new Regex(@"{{\s*(\..+?)\s*}}");
+            var VariablesRegEx = new Regex(@"{{\s*(\..+?)\s*}}");
             var VariablesRegExMatches = VariablesRegEx.Match(template);
 
             while (VariablesRegExMatches.Success)
             {
-                string expanded = string.Empty;
+                var expanded = string.Empty;
 
-                string all = VariablesRegExMatches.Groups[0].Value;
-                string variable = VariablesRegExMatches.Groups[1].Value;
+                var all = VariablesRegExMatches.Groups[0].Value;
+                var variable = VariablesRegExMatches.Groups[1].Value;
 
-                string value = (string)variables[variable];
+                var value = (string)variables[variable];
                 if (modifier != null)
                     value = modifier(value);
                 template = template.Replace(all, value);
@@ -432,12 +432,12 @@ namespace Jackett.Common.Indexers
 
             var ResultParser = new HtmlParser();
             var ResultDocument = ResultParser.ParseDocument(loginResult.Content);
-            foreach (errorBlock error in errorBlocks)
+            foreach (var error in errorBlocks)
             {
                 var selection = ResultDocument.QuerySelector(error.Selector);
                 if (selection != null)
                 {
-                    string errorMessage = selection.TextContent;
+                    var errorMessage = selection.TextContent;
                     if (error.Message != null)
                     {
                         errorMessage = handleSelector(error.Message, ResultDocument.FirstElementChild);
@@ -858,7 +858,7 @@ namespace Jackett.Common.Indexers
 
             configData.CookieHeader.Value = null;
             if (Login.Cookies != null)
-                configData.CookieHeader.Value = String.Join("; ", Login.Cookies);
+                configData.CookieHeader.Value = string.Join("; ", Login.Cookies);
             landingResult = await RequestStringWithCookies(LoginUrl.AbsoluteUri, null, SiteLink);
 
             var htmlParser = new HtmlParser();
@@ -965,7 +965,7 @@ namespace Jackett.Common.Indexers
             if (Filters == null)
                 return Data;
 
-            foreach (filterBlock Filter in Filters)
+            foreach (var Filter in Filters)
             {
                 switch (Filter.Name)
                 {
@@ -996,7 +996,7 @@ namespace Jackett.Common.Indexers
                         var regexpreplace_pattern = (string)Filter.Args[0];
                         var regexpreplace_replacement = (string)Filter.Args[1];
                         regexpreplace_replacement = applyGoTemplateText(regexpreplace_replacement, variables);
-                        Regex regexpreplace_regex = new Regex(regexpreplace_pattern);
+                        var regexpreplace_regex = new Regex(regexpreplace_pattern);
                         Data = regexpreplace_regex.Replace(Data, regexpreplace_replacement);
                         break;
                     case "split":
@@ -1059,12 +1059,12 @@ namespace Jackett.Common.Indexers
                         {
                             // Should replace diacritics charcaters with their base character
                             // It's not perfect, e.g. "ŠĐĆŽ - šđčćž" becomes "SĐCZ-sđccz"
-                            string stFormD = Data.Normalize(NormalizationForm.FormD);
-                            int len = stFormD.Length;
-                            StringBuilder sb = new StringBuilder();
-                            for (int i = 0; i < len; i++)
+                            var stFormD = Data.Normalize(NormalizationForm.FormD);
+                            var len = stFormD.Length;
+                            var sb = new StringBuilder();
+                            for (var i = 0; i < len; i++)
                             {
-                                System.Globalization.UnicodeCategory uc = System.Globalization.CharUnicodeInfo.GetUnicodeCategory(stFormD[i]);
+                                var uc = System.Globalization.CharUnicodeInfo.GetUnicodeCategory(stFormD[i]);
                                 if (uc != System.Globalization.UnicodeCategory.NonSpacingMark)
                                 {
                                     sb.Append(stFormD[i]);
@@ -1121,7 +1121,7 @@ namespace Jackett.Common.Indexers
                 return applyFilters(applyGoTemplateText(Selector.Text, variables), Selector.Filters, variables);
             }
 
-            IElement selection = Dom;
+            var selection = Dom;
             string value = null;
 
             if (Selector.Selector != null)
@@ -1183,7 +1183,7 @@ namespace Jackett.Common.Indexers
         {
             var releases = new List<ReleaseInfo>();
 
-            searchBlock Search = Definition.Search;
+            var Search = Definition.Search;
 
             // init template context
             var variables = getTemplateVariablesFromConfigData();
@@ -1216,7 +1216,7 @@ namespace Jackett.Common.Indexers
             var mappedCategories = MapTorznabCapsToTrackers(query);
             if (mappedCategories.Count == 0)
             {
-                mappedCategories = this.DefaultCategories;
+                mappedCategories = DefaultCategories;
             }
 
             variables[".Categories"] = mappedCategories;
@@ -1254,9 +1254,9 @@ namespace Jackett.Common.Indexers
                 // HttpUtility.UrlPathEncode seems to only encode spaces, we use UrlEncode and replace + with %20 as a workaround
                 var searchUrl = resolvePath(applyGoTemplateText(SearchPath.Path, variables, WebUtility.UrlEncode).Replace("+", "%20")).AbsoluteUri;
                 var queryCollection = new List<KeyValuePair<string, string>>();
-                RequestType method = RequestType.GET;
+                var method = RequestType.GET;
 
-                if (String.Equals(SearchPath.Method, "post", StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(SearchPath.Method, "post", StringComparison.OrdinalIgnoreCase))
                 {
                     method = RequestType.POST;
                 }
@@ -1275,7 +1275,7 @@ namespace Jackett.Common.Indexers
                             if (Input.Key == "$raw")
                             {
                                 var rawStr = applyGoTemplateText(Input.Value, variables, WebUtility.UrlEncode);
-                                foreach (string part in rawStr.Split('&'))
+                                foreach (var part in rawStr.Split('&'))
                                 {
                                     var parts = part.Split(new char[] { '=' }, 2);
                                     var key = parts[0];
@@ -1358,7 +1358,7 @@ namespace Jackett.Common.Indexers
 
                     var rowsSelector = applyGoTemplateText(Search.Rows.Selector, variables);
                     var RowsDom = SearchResultDocument.QuerySelectorAll(rowsSelector);
-                    List<IElement> Rows = new List<IElement>();
+                    var Rows = new List<IElement>();
                     foreach (var RowDom in RowsDom)
                     {
                         Rows.Add(RowDom);
@@ -1368,14 +1368,14 @@ namespace Jackett.Common.Indexers
                     var After = Definition.Search.Rows.After;
                     if (After > 0)
                     {
-                        for (int i = 0; i < Rows.Count; i += 1)
+                        for (var i = 0; i < Rows.Count; i += 1)
                         {
                             var CurrentRow = Rows[i];
-                            for (int j = 0; j < After; j += 1)
+                            for (var j = 0; j < After; j += 1)
                             {
                                 var MergeRowIndex = i + j + 1;
                                 var MergeRow = Rows[MergeRowIndex];
-                                List<INode> MergeNodes = new List<INode>();
+                                var MergeNodes = new List<INode>();
                                 foreach (var node in MergeRow.ChildNodes)
                                 {
                                     MergeNodes.Add(node);
@@ -1535,14 +1535,14 @@ namespace Jackett.Common.Indexers
                                             value = release.Imdb.ToString();
                                             break;
                                         case "rageid":
-                                            Regex RageIDRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
+                                            var RageIDRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
                                             var RageIDMatch = RageIDRegEx.Match(value);
                                             var RageID = RageIDMatch.Groups[1].Value;
                                             release.RageID = ParseUtil.CoerceLong(RageID);
                                             value = release.RageID.ToString();
                                             break;
                                         case "tvdbid":
-                                            Regex TVDBIdRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
+                                            var TVDBIdRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
                                             var TVDBIdMatch = TVDBIdRegEx.Match(value);
                                             var TVDBId = TVDBIdMatch.Groups[1].Value;
                                             release.TVDBId = ParseUtil.CoerceLong(TVDBId);
@@ -1575,12 +1575,12 @@ namespace Jackett.Common.Indexers
                             var SkipRelease = false;
                             if (Filters != null)
                             {
-                                foreach (filterBlock Filter in Filters)
+                                foreach (var Filter in Filters)
                                 {
                                     switch (Filter.Name)
                                     {
                                         case "andmatch":
-                                            int CharacterLimit = -1;
+                                            var CharacterLimit = -1;
                                             if (Filter.Args != null)
                                                 CharacterLimit = int.Parse(Filter.Args);
 
@@ -1672,8 +1672,8 @@ namespace Jackett.Common.Indexers
             Dictionary<string, string> pairs = null;
             var queryCollection = new NameValueCollection();
 
-            RequestType method = RequestType.GET;
-            if (String.Equals(request.Method, "post", StringComparison.OrdinalIgnoreCase))
+            var method = RequestType.GET;
+            if (string.Equals(request.Method, "post", StringComparison.OrdinalIgnoreCase))
             {
                 method = RequestType.POST;
                 pairs = new Dictionary<string, string>();
@@ -1711,7 +1711,7 @@ namespace Jackett.Common.Indexers
             variables[prefix + ".PathAndQuery"] = uri.PathAndQuery;
             variables[prefix + ".Query"] = uri.Query;
             var queryString = QueryHelpers.ParseQuery(uri.Query);
-            foreach (string key in queryString.Keys)
+            foreach (var key in queryString.Keys)
             {
                 //If we have supplied the same query string multiple time, just take the first.
                 variables[prefix + ".Query." + key] = queryString[key].First();
diff --git a/src/Jackett.Common/Indexers/DanishBits.cs b/src/Jackett.Common/Indexers/DanishBits.cs
index 8387a6818..b9a1a2236 100644
--- a/src/Jackett.Common/Indexers/DanishBits.cs
+++ b/src/Jackett.Common/Indexers/DanishBits.cs
@@ -51,7 +51,7 @@ namespace Jackett.Common.Indexers
                 return "%";
             }
             var searchString = query.GetQueryString();
-            Regex ReplaceRegex = new Regex("[^a-zA-Z0-9]+");
+            var ReplaceRegex = new Regex("[^a-zA-Z0-9]+");
             searchString = ReplaceRegex.Replace(searchString, "%");
             return searchString;
         }
diff --git a/src/Jackett.Common/Indexers/DigitalHive.cs b/src/Jackett.Common/Indexers/DigitalHive.cs
index 635633e87..689134264 100644
--- a/src/Jackett.Common/Indexers/DigitalHive.cs
+++ b/src/Jackett.Common/Indexers/DigitalHive.cs
@@ -91,10 +91,10 @@ namespace Jackett.Common.Indexers
         {
             var loginPage = await RequestStringWithCookies(LoginUrl, configData.CookieHeader.Value);
             CQ cq = loginPage.Content;
-            string recaptchaSiteKey = cq.Find(".g-recaptcha").Attr("data-sitekey");
+            var recaptchaSiteKey = cq.Find(".g-recaptcha").Attr("data-sitekey");
             if (recaptchaSiteKey != null)
             {
-                var result = this.configData;
+                var result = configData;
                 result.CookieHeader.Value = loginPage.Cookies;
                 result.Captcha.SiteKey = recaptchaSiteKey;
                 result.Captcha.Version = "2";
@@ -158,7 +158,7 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+            var releases = new List<ReleaseInfo>();
 
             var queryCollection = new NameValueCollection();
             var searchString = query.GetQueryString();
@@ -197,7 +197,7 @@ namespace Jackett.Common.Indexers
 
         private IEnumerable<ReleaseInfo> contentToReleaseInfos(TorznabQuery query, CQ dom)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+            var releases = new List<ReleaseInfo>();
 
             // Doesn't handle pagination yet...
             var rows = dom["div.panel-body > table.table > tbody > tr"];
diff --git a/src/Jackett.Common/Indexers/EliteTracker.cs b/src/Jackett.Common/Indexers/EliteTracker.cs
index 94ea3274a..59d87d6ed 100644
--- a/src/Jackett.Common/Indexers/EliteTracker.cs
+++ b/src/Jackett.Common/Indexers/EliteTracker.cs
@@ -266,7 +266,7 @@ namespace Jackett.Common.Indexers
                     //issue #5064 replace multi keyword
                     if (!string.IsNullOrEmpty(ReplaceMulti))
                     {
-                        System.Text.RegularExpressions.Regex regex = new Regex("(?i)([\\.\\- ])MULTI([\\.\\- ])");
+                        var regex = new Regex("(?i)([\\.\\- ])MULTI([\\.\\- ])");
                         release.Title = regex.Replace(release.Title, "$1" + ReplaceMulti + "$2");
                     }
                     // issue #6855 Replace VOSTFR with ENGLISH
diff --git a/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs b/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs
index 686ae2cd7..b5e5858b3 100644
--- a/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs
+++ b/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
@@ -36,12 +35,12 @@ namespace Jackett.Common.Indexers.Feeds
                 Link = item.FirstValue("link").ToUri(),
                 Comments = item.FirstValue("comments").ToUri(),
                 PublishDate = item.FirstValue("pubDate").ToDateTime(),
-                Category = new List<int> { Int32.Parse(attributes.First(e => e.Attribute("name").Value == "category").Attribute("value").Value) },
-                Size = ReadAttribute(attributes, "size").TryParse<Int64>(),
-                Files = ReadAttribute(attributes, "files").TryParse<Int64>(),
+                Category = new List<int> { int.Parse(attributes.First(e => e.Attribute("name").Value == "category").Attribute("value").Value) },
+                Size = ReadAttribute(attributes, "size").TryParse<long>(),
+                Files = ReadAttribute(attributes, "files").TryParse<long>(),
                 Description = item.FirstValue("description"),
-                Seeders = ReadAttribute(attributes, "seeders").TryParse<Int32>(),
-                Peers = ReadAttribute(attributes, "peers").TryParse<Int32>(),
+                Seeders = ReadAttribute(attributes, "seeders").TryParse<int>(),
+                Peers = ReadAttribute(attributes, "peers").TryParse<int>(),
                 InfoHash = attributes.First(e => e.Attribute("name").Value == "infohash").Attribute("value").Value,
                 MagnetUri = attributes.First(e => e.Attribute("name").Value == "magneturl").Attribute("value").Value.ToUri(),
             };
diff --git a/src/Jackett.Common/Indexers/FileList.cs b/src/Jackett.Common/Indexers/FileList.cs
index b6ea8de32..cdef68ffe 100644
--- a/src/Jackett.Common/Indexers/FileList.cs
+++ b/src/Jackett.Common/Indexers/FileList.cs
@@ -106,7 +106,7 @@ namespace Jackett.Common.Indexers
             var searchString = query.GetQueryString();
 
             var cats = MapTorznabCapsToTrackers(query);
-            string cat = "0";
+            var cat = "0";
             if (cats.Count == 1)
             {
                 cat = cats[0];
diff --git a/src/Jackett.Common/Indexers/FunFile.cs b/src/Jackett.Common/Indexers/FunFile.cs
index 15a1d1a08..da604b507 100644
--- a/src/Jackett.Common/Indexers/FunFile.cs
+++ b/src/Jackett.Common/Indexers/FunFile.cs
@@ -74,7 +74,7 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+            var releases = new List<ReleaseInfo>();
 
             var searchString = query.GetQueryString();
             var searchUrl = SearchUrl;
@@ -88,7 +88,7 @@ namespace Jackett.Common.Indexers
             }
 
             var cats = MapTorznabCapsToTrackers(query);
-            string cat = "0";
+            var cat = "0";
             if (cats.Count == 1)
             {
                 cat = cats[0];
diff --git a/src/Jackett.Common/Indexers/Fuzer.cs b/src/Jackett.Common/Indexers/Fuzer.cs
index 38ef778c7..86fdd5e6e 100644
--- a/src/Jackett.Common/Indexers/Fuzer.cs
+++ b/src/Jackett.Common/Indexers/Fuzer.cs
@@ -107,7 +107,7 @@ namespace Jackett.Common.Indexers
             var captcha = cq.Find(".g-recaptcha"); // invisible recaptcha
             if (captcha.Any())
             {
-                var result = this.configData;
+                var result = configData;
                 result.CookieHeader.Value = loginPage.Cookies;
                 result.Captcha.SiteKey = captcha.Attr("data-sitekey");
                 result.Captcha.Version = "2";
@@ -232,7 +232,7 @@ namespace Jackett.Common.Indexers
                 var rows = dom["tr.box_torrent"];
                 foreach (var row in rows)
                 {
-                    CQ qRow = row.Cq();
+                    var qRow = row.Cq();
 
                     var release = new ReleaseInfo();
                     var main_title_link = qRow.Find("div.main_title > a");
@@ -243,11 +243,10 @@ namespace Jackett.Common.Indexers
                     release.MinimumRatio = 1;
                     release.MinimumSeedTime = 172800; // 48 hours
 
-                    int seeders, peers;
-                    if (ParseUtil.TryCoerceInt(qRow.Find("td:nth-child(7) > div").Text(), out seeders))
+                    if (ParseUtil.TryCoerceInt(qRow.Find("td:nth-child(7) > div").Text(), out var seeders))
                     {
                         release.Seeders = seeders;
-                        if (ParseUtil.TryCoerceInt(qRow.Find("td:nth-child(8) > div").Text(), out peers))
+                        if (ParseUtil.TryCoerceInt(qRow.Find("td:nth-child(8) > div").Text(), out var peers))
                         {
                             release.Peers = peers + release.Seeders;
                         }
@@ -255,7 +254,7 @@ namespace Jackett.Common.Indexers
                     release.Grabs = ParseUtil.CoerceLong(qRow.Find("td:nth-child(5)").Text().Replace(",", ""));
                     release.Seeders = ParseUtil.CoerceInt(qRow.Find("td:nth-child(6)").Text().Replace(",", ""));
                     release.Peers = ParseUtil.CoerceInt(qRow.Find("td:nth-child(7)").Text().Replace(",", "")) + release.Seeders;
-                    string fullSize = qRow.Find("td:nth-child(4)").Text();
+                    var fullSize = qRow.Find("td:nth-child(4)").Text();
                     release.Size = ReleaseInfo.GetBytes(fullSize);
 
                     release.Comments = new Uri(SiteLink + qRow.Find("a.threadlink[href]").Attr("href"));
@@ -272,10 +271,10 @@ namespace Jackett.Common.Indexers
 
                     var dateStringAll = qRow.Find("div.up_info2")[0].ChildNodes.Last().ToString();
                     var dateParts = dateStringAll.Split(' ');
-                    string dateString = dateParts[dateParts.Length - 2] + " " + dateParts[dateParts.Length - 1];
+                    var dateString = dateParts[dateParts.Length - 2] + " " + dateParts[dateParts.Length - 1];
                     release.PublishDate = DateTime.ParseExact(dateString, "dd/MM/yy HH:mm", CultureInfo.InvariantCulture);
 
-                    string categoryLink = qRow.Find("a[href^=\"/browse.php?cat=\"]").Attr("href");
+                    var categoryLink = qRow.Find("a[href^=\"/browse.php?cat=\"]").Attr("href");
                     var catid = ParseUtil.GetArgumentFromQueryString(categoryLink, "cat");
                     release.Category = MapTrackerCatToNewznab(catid);
 
@@ -313,7 +312,7 @@ namespace Jackett.Common.Indexers
 
             CQ dom = results.Content;
 
-            int rowCount = 0;
+            var rowCount = 0;
             var rows = dom["#listtable > tbody > tr"];
 
             foreach (var row in rows)
@@ -324,8 +323,8 @@ namespace Jackett.Common.Indexers
                     continue;
                 }
 
-                CQ qRow = row.Cq();
-                CQ link = qRow.Find("td:nth-child(1) > a");
+                var qRow = row.Cq();
+                var link = qRow.Find("td:nth-child(1) > a");
                 if (link.Text().Trim().ToLower() == searchTerm.Trim().ToLower())
                 {
                     var address = link.Attr("href");
diff --git a/src/Jackett.Common/Indexers/GazelleGames.cs b/src/Jackett.Common/Indexers/GazelleGames.cs
index 4a0194de4..26a5a2e0e 100644
--- a/src/Jackett.Common/Indexers/GazelleGames.cs
+++ b/src/Jackett.Common/Indexers/GazelleGames.cs
@@ -230,13 +230,13 @@ namespace Jackett.Common.Indexers
 
             try
             {
-                string RowsSelector = ".torrent_table > tbody > tr";
+                var RowsSelector = ".torrent_table > tbody > tr";
 
                 var SearchResultParser = new HtmlParser();
                 var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
                 var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
 
-                bool stickyGroup = false;
+                var stickyGroup = false;
                 string CategoryStr;
                 ICollection<int> GroupCategory = null;
                 string GroupTitle = null;
diff --git a/src/Jackett.Common/Indexers/HDBitsApi.cs b/src/Jackett.Common/Indexers/HDBitsApi.cs
index 4d23f2ad2..8cdc57a99 100644
--- a/src/Jackett.Common/Indexers/HDBitsApi.cs
+++ b/src/Jackett.Common/Indexers/HDBitsApi.cs
@@ -75,7 +75,7 @@ namespace Jackett.Common.Indexers
         {
             dynamic requestData = new JObject();
             var queryString = query.GetQueryString();
-            int? imdbId = ParseUtil.GetImdbID(query.ImdbID);
+            var imdbId = ParseUtil.GetImdbID(query.ImdbID);
 
             if (imdbId != null)
             {
diff --git a/src/Jackett.Common/Indexers/HDOlimpo.cs b/src/Jackett.Common/Indexers/HDOlimpo.cs
index 2e4e0b627..589e8570e 100644
--- a/src/Jackett.Common/Indexers/HDOlimpo.cs
+++ b/src/Jackett.Common/Indexers/HDOlimpo.cs
@@ -131,7 +131,7 @@ namespace Jackett.Common.Indexers
                 response = await PostDataWithCookies(SearchUrl, pairs, configData.CookieHeader.Value, SiteLink, headers, body);
             }
 
-            List<ReleaseInfo> releases = ParseResponse(query, response, includePremium);
+            var releases = ParseResponse(query, response, includePremium);
 
             return releases;
         }
@@ -145,7 +145,7 @@ namespace Jackett.Common.Indexers
 
         private List<ReleaseInfo> ParseResponse(TorznabQuery query, WebClientStringResult response, bool includePremium)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+            var releases = new List<ReleaseInfo>();
 
             var torrents = CheckResponse(response);
 
diff --git a/src/Jackett.Common/Indexers/HDSpace.cs b/src/Jackett.Common/Indexers/HDSpace.cs
index b15d558a4..dabc3748b 100644
--- a/src/Jackett.Common/Indexers/HDSpace.cs
+++ b/src/Jackett.Common/Indexers/HDSpace.cs
@@ -92,7 +92,7 @@ namespace Jackett.Common.Indexers
             {
                 var errorStr = "You have {0} remaining login attempts";
                 var remainingAttemptSpan = new Regex(string.Format(errorStr, "(.*?)")).Match(loginPage.Content).Groups[1].ToString();
-                var attempts = Regex.Replace(remainingAttemptSpan, "<.*?>", String.Empty);
+                var attempts = Regex.Replace(remainingAttemptSpan, "<.*?>", string.Empty);
                 var errorMessage = string.Format(errorStr, attempts);
                 throw new ExceptionWithConfigData(errorMessage, configData);
             });
@@ -131,7 +131,7 @@ namespace Jackett.Common.Indexers
                     if (prev == null || prev.NodeName.ToLowerInvariant() != "style")
                         continue;
 
-                    CQ qRow = row.Cq();
+                    var qRow = row.Cq();
                     var release = new ReleaseInfo();
 
                     release.MinimumRatio = 1;
diff --git a/src/Jackett.Common/Indexers/HDTorrents.cs b/src/Jackett.Common/Indexers/HDTorrents.cs
index 88d49b54c..2e01164b7 100644
--- a/src/Jackett.Common/Indexers/HDTorrents.cs
+++ b/src/Jackett.Common/Indexers/HDTorrents.cs
@@ -133,22 +133,22 @@ namespace Jackett.Common.Indexers
                 CQ dom = results.Content;
                 ReleaseInfo release;
 
-                CQ userInfo = dom[".mainmenu > table > tbody > tr:has(td[title=\"Active-Torrents\"])"][0].Cq();
-                string rank = userInfo.Find("td:nth-child(2)").Text().Substring(6);
+                var userInfo = dom[".mainmenu > table > tbody > tr:has(td[title=\"Active-Torrents\"])"][0].Cq();
+                var rank = userInfo.Find("td:nth-child(2)").Text().Substring(6);
 
-                HashSet<string> freeleechRanks = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                var freeleechRanks = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
                 freeleechRanks.Add("VIP");
                 freeleechRanks.Add("Uploader");
                 freeleechRanks.Add("HD Internal");
                 freeleechRanks.Add("Moderator");
                 freeleechRanks.Add("Administrator");
                 freeleechRanks.Add("Owner");
-                bool hasFreeleech = freeleechRanks.Contains(rank);
+                var hasFreeleech = freeleechRanks.Contains(rank);
 
                 var rows = dom[".mainblockcontenttt > tbody > tr:has(a[href^=\"details.php?id=\"])"];
                 foreach (var row in rows)
                 {
-                    CQ qRow = row.Cq();
+                    var qRow = row.Cq();
 
                     release = new ReleaseInfo();
 
@@ -158,7 +158,7 @@ namespace Jackett.Common.Indexers
                     release.MinimumRatio = 1;
                     release.MinimumSeedTime = 172800; // 48 hours
 
-                    int tdIndex = 0;
+                    var tdIndex = 0;
                     if (qRow.Find("td:nth-last-child(1)").Text() == "Edit")
                         tdIndex = 1;
                     // moderators get additional delete, recomend and like links
@@ -166,33 +166,33 @@ namespace Jackett.Common.Indexers
                         tdIndex = 4;
 
                     // Sometimes the uploader column is missing
-                    if (ParseUtil.TryCoerceInt(qRow.Find($"td:nth-last-child({tdIndex + 3})").Text(), out int seeders))
+                    if (ParseUtil.TryCoerceInt(qRow.Find($"td:nth-last-child({tdIndex + 3})").Text(), out var seeders))
                     {
                         release.Seeders = seeders;
-                        if (ParseUtil.TryCoerceInt(qRow.Find($"td:nth-last-child({tdIndex + 2})").Text(), out int peers))
+                        if (ParseUtil.TryCoerceInt(qRow.Find($"td:nth-last-child({tdIndex + 2})").Text(), out var peers))
                         {
                             release.Peers = peers + release.Seeders;
                         }
                     }
 
                     // Sometimes the grabs column is missing
-                    if (ParseUtil.TryCoerceLong(qRow.Find($"td:nth-last-child({tdIndex + 1})").Text(), out long grabs))
+                    if (ParseUtil.TryCoerceLong(qRow.Find($"td:nth-last-child({tdIndex + 1})").Text(), out var grabs))
                     {
                         release.Grabs = grabs;
                     }
 
-                    string fullSize = qRow.Find("td.mainblockcontent").Get(6).InnerText;
+                    var fullSize = qRow.Find("td.mainblockcontent").Get(6).InnerText;
                     release.Size = ReleaseInfo.GetBytes(fullSize);
 
                     release.Guid = new Uri(SiteLink + qRow.Find("td.mainblockcontent b a").Attr("href"));
                     release.Link = new Uri(SiteLink + qRow.Find("td.mainblockcontent").Get(3).FirstChild.GetAttribute("href"));
                     release.Comments = new Uri(SiteLink + qRow.Find("td.mainblockcontent b a").Attr("href"));
 
-                    string[] dateSplit = qRow.Find("td.mainblockcontent").Get(5).InnerHTML.Split(',');
-                    string dateString = dateSplit[1].Substring(0, dateSplit[1].IndexOf('>')).Trim();
+                    var dateSplit = qRow.Find("td.mainblockcontent").Get(5).InnerHTML.Split(',');
+                    var dateString = dateSplit[1].Substring(0, dateSplit[1].IndexOf('>')).Trim();
                     release.PublishDate = DateTime.ParseExact(dateString, "dd MMM yyyy HH:mm:ss zz00", CultureInfo.InvariantCulture).ToLocalTime();
 
-                    string category = qRow.Find("td:eq(0) a").Attr("href").Replace("torrents.php?category=", "");
+                    var category = qRow.Find("td:eq(0) a").Attr("href").Replace("torrents.php?category=", "");
                     release.Category = MapTrackerCatToNewznab(category);
 
                     release.UploadVolumeFactor = 1;
diff --git a/src/Jackett.Common/Indexers/Hebits.cs b/src/Jackett.Common/Indexers/Hebits.cs
index 61cd9e443..45cb98745 100644
--- a/src/Jackett.Common/Indexers/Hebits.cs
+++ b/src/Jackett.Common/Indexers/Hebits.cs
@@ -102,7 +102,7 @@ namespace Jackett.Common.Indexers
             {
                 CQ dom = response.Content;
 
-                CQ qRows = dom[".browse > div > div"];
+                var qRows = dom[".browse > div > div"];
 
                 foreach (var row in qRows)
                 {
diff --git a/src/Jackett.Common/Indexers/HorribleSubs.cs b/src/Jackett.Common/Indexers/HorribleSubs.cs
index 94ce84b28..77525da58 100644
--- a/src/Jackett.Common/Indexers/HorribleSubs.cs
+++ b/src/Jackett.Common/Indexers/HorribleSubs.cs
@@ -17,7 +17,7 @@ using NLog;
 
 namespace Jackett.Common.Indexers
 {
-    class HorribleSubs : BaseWebIndexer
+    internal class HorribleSubs : BaseWebIndexer
     {
         private string ApiEndpoint { get { return SiteLink + "api.php"; } }
 
@@ -153,13 +153,13 @@ namespace Jackett.Common.Indexers
                 var showPageResponse = await RequestStringWithCookiesAndRetry(ResultURL, string.Empty);
                 await FollowIfRedirect(showPageResponse);
 
-                Match match = Regex.Match(showPageResponse.Content, "(var hs_showid = )([0-9]*)(;)", RegexOptions.IgnoreCase);
+                var match = Regex.Match(showPageResponse.Content, "(var hs_showid = )([0-9]*)(;)", RegexOptions.IgnoreCase);
                 if (match.Success == false)
                 {
                     return releases;
                 }
 
-                int ShowID = int.Parse(match.Groups[2].Value);
+                var ShowID = int.Parse(match.Groups[2].Value);
 
                 var apiUrls = new string[] {
                     ApiEndpoint + "?method=getshows&type=batch&showid=" + ShowID, //https://horriblesubs.info/api.php?method=getshows&type=batch&showid=1194
@@ -167,9 +167,9 @@ namespace Jackett.Common.Indexers
                 };
 
                 var releaserows = new List<AngleSharp.Dom.IElement>();
-                foreach (string apiUrl in apiUrls)
+                foreach (var apiUrl in apiUrls)
                 {
-                    int nextId = 0;
+                    var nextId = 0;
                     while (true)
                     {
                         var showAPIResponse = await RequestStringWithCookiesAndRetry(apiUrl + "&nextid=" + nextId, string.Empty);
@@ -187,8 +187,8 @@ namespace Jackett.Common.Indexers
 
                 foreach (var releaserow in releaserows)
                 {
-                    string dateStr = releaserow.QuerySelector(".rls-date").TextContent.Trim();
-                    string title = releaserow.FirstChild.TextContent;
+                    var dateStr = releaserow.QuerySelector(".rls-date").TextContent.Trim();
+                    var title = releaserow.FirstChild.TextContent;
                     title = title.Replace("SD720p1080p", "");
                     title = title.Replace(dateStr, "");
 
diff --git a/src/Jackett.Common/Indexers/LostFilm.cs b/src/Jackett.Common/Indexers/LostFilm.cs
index 76949cd6f..05871c9db 100644
--- a/src/Jackett.Common/Indexers/LostFilm.cs
+++ b/src/Jackett.Common/Indexers/LostFilm.cs
@@ -19,21 +19,25 @@ using NLog;
 
 namespace Jackett.Common.Indexers
 {
-    class LostFilm : BaseWebIndexer
+    internal class LostFilm : BaseWebIndexer
     {
-        private static Regex parsePlayEpisodeRegex = new Regex("PlayEpisode\\('(?<id>\\d{1,3})(?<season>\\d{3})(?<episode>\\d{3})'\\)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-        private static Regex parseReleaseDetailsRegex = new Regex("Видео:\\ (?<quality>.+).\\ Размер:\\ (?<size>.+).\\ Перевод", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex parsePlayEpisodeRegex = new Regex("PlayEpisode\\('(?<id>\\d{1,3})(?<season>\\d{3})(?<episode>\\d{3})'\\)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex parseReleaseDetailsRegex = new Regex("Видео:\\ (?<quality>.+).\\ Размер:\\ (?<size>.+).\\ Перевод", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+        private string LoginUrl { get { return SiteLink + "login"; } }
 
-        string LoginUrl { get { return SiteLink + "login"; } }
         // http://www.lostfilm.tv/login
-        string ApiUrl { get { return SiteLink + "ajaxik.php"; } }
+        private string ApiUrl { get { return SiteLink + "ajaxik.php"; } }
+
         // http://www.lostfilm.tv/new
-        string DiscoveryUrl { get { return SiteLink + "new"; } }
+        private string DiscoveryUrl { get { return SiteLink + "new"; } }
+
         // http://www.lostfilm.tv/search?q=breaking+bad
-        string SearchUrl { get { return SiteLink + "search"; } }
+        private string SearchUrl { get { return SiteLink + "search"; } }
+
         // PlayEpisode function produce urls like this:
         // https://www.lostfilm.tv/v_search.php?c=119&s=5&e=16
-        string ReleaseUrl { get { return SiteLink + "v_search.php"; } }
+        private string ReleaseUrl { get { return SiteLink + "v_search.php"; } }
 
 
         internal class TrackerUrlDetails
@@ -77,7 +81,7 @@ namespace Jackett.Common.Indexers
             }
         }
 
-        new ConfigurationDataCaptchaLogin configData
+        private new ConfigurationDataCaptchaLogin configData
         {
             get { return (ConfigurationDataCaptchaLogin)base.configData; }
             set { base.configData = value; }
@@ -104,7 +108,7 @@ namespace Jackett.Common.Indexers
             // looks like after some failed login attempts there's a captcha
             var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
             CQ dom = loginPage.Content;
-            CQ qCaptchaImg = dom.Find("img#captcha_pictcha").First();
+            var qCaptchaImg = dom.Find("img#captcha_pictcha").First();
             if (qCaptchaImg.Length == 1)
             {
                 var CaptchaUrl = SiteLink + qCaptchaImg.Attr("src");
@@ -161,7 +165,7 @@ namespace Jackett.Common.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        private async Task<Boolean> Logout()
+        private async Task<bool> Logout()
         {
             logger.Info("Performing logout");
 
diff --git a/src/Jackett.Common/Indexers/Meta/BaseMetaIndexer.cs b/src/Jackett.Common/Indexers/Meta/BaseMetaIndexer.cs
index 885d3ed64..127c6660c 100644
--- a/src/Jackett.Common/Indexers/Meta/BaseMetaIndexer.cs
+++ b/src/Jackett.Common/Indexers/Meta/BaseMetaIndexer.cs
@@ -131,8 +131,8 @@ namespace Jackett.Common.Indexers.Meta
 
         public IEnumerable<IIndexer> Indexers;
 
-        private Func<IIndexer, bool> filterFunc;
-        private IFallbackStrategyProvider fallbackStrategyProvider;
-        private IResultFilterProvider resultFilterProvider;
+        private readonly Func<IIndexer, bool> filterFunc;
+        private readonly IFallbackStrategyProvider fallbackStrategyProvider;
+        private readonly IResultFilterProvider resultFilterProvider;
     }
 }
diff --git a/src/Jackett.Common/Indexers/Meta/Fallbacks.cs b/src/Jackett.Common/Indexers/Meta/Fallbacks.cs
index bd647ec6a..0655fcef5 100644
--- a/src/Jackett.Common/Indexers/Meta/Fallbacks.cs
+++ b/src/Jackett.Common/Indexers/Meta/Fallbacks.cs
@@ -38,7 +38,7 @@ namespace Jackett.Common.Indexers.Meta
         public ImdbFallbackStrategy(IImdbResolver resolver, TorznabQuery query)
         {
             this.resolver = resolver;
-            this.titles = null;
+            titles = null;
             this.query = query;
         }
 
@@ -49,9 +49,9 @@ namespace Jackett.Common.Indexers.Meta
             return titles.Select(t => query.CreateFallback(t));
         }
 
-        private IImdbResolver resolver;
+        private readonly IImdbResolver resolver;
         private IEnumerable<string> titles;
-        private TorznabQuery query;
+        private readonly TorznabQuery query;
     }
 
     public class ImdbFallbackStrategyProvider : IFallbackStrategyProvider
@@ -71,6 +71,6 @@ namespace Jackett.Common.Indexers.Meta
             return result;
         }
 
-        private IImdbResolver resolver;
+        private readonly IImdbResolver resolver;
     }
 }
diff --git a/src/Jackett.Common/Indexers/Meta/ResultFilters.cs b/src/Jackett.Common/Indexers/Meta/ResultFilters.cs
index d4729c111..465435a0e 100644
--- a/src/Jackett.Common/Indexers/Meta/ResultFilters.cs
+++ b/src/Jackett.Common/Indexers/Meta/ResultFilters.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -31,8 +30,8 @@ namespace Jackett.Common.Indexers.Meta
             long? imdbId = null;
             try
             {
-                var normalizedImdbId = String.Concat(query.ImdbID.Where(c => char.IsDigit(c)));
-                imdbId = Int64.Parse(normalizedImdbId);
+                var normalizedImdbId = string.Concat(query.ImdbID.Where(c => char.IsDigit(c)));
+                imdbId = long.Parse(normalizedImdbId);
             }
             catch
             {
@@ -89,8 +88,8 @@ namespace Jackett.Common.Indexers.Meta
             return result;
         }
 
-        private IImdbResolver resolver;
-        private TorznabQuery query;
+        private readonly IImdbResolver resolver;
+        private readonly TorznabQuery query;
     }
 
     public class NoFilter : IResultFilter
@@ -126,6 +125,6 @@ namespace Jackett.Common.Indexers.Meta
             return filter.ToEnumerable();
         }
 
-        private IImdbResolver resolver;
+        private readonly IImdbResolver resolver;
     }
 }
diff --git a/src/Jackett.Common/Indexers/MyAnonamouse.cs b/src/Jackett.Common/Indexers/MyAnonamouse.cs
index 31fc93b65..63f6f70a6 100644
--- a/src/Jackett.Common/Indexers/MyAnonamouse.cs
+++ b/src/Jackett.Common/Indexers/MyAnonamouse.cs
@@ -168,7 +168,7 @@ namespace Jackett.Common.Indexers
         {
             var releases = new List<ReleaseInfo>();
 
-            NameValueCollection qParams = new NameValueCollection();
+            var qParams = new NameValueCollection();
             qParams.Add("tor[text]", query.GetQueryString());
             qParams.Add("tor[srchIn][title]", "true");
             qParams.Add("tor[srchIn][author]", "true");
@@ -184,11 +184,11 @@ namespace Jackett.Common.Indexers
             qParams.Add("description", "1"); // include the description
             //qParams.Add("bookmarks", "0"); // include if the item is bookmarked or not
 
-            List<string> catList = MapTorznabCapsToTrackers(query);
+            var catList = MapTorznabCapsToTrackers(query);
             if (catList.Any())
             {
-                int index = 0;
-                foreach (string cat in catList)
+                var index = 0;
+                foreach (var cat in catList)
                 {
                     qParams.Add("tor[cat][" + index + "]", cat);
                     index++;
@@ -199,7 +199,7 @@ namespace Jackett.Common.Indexers
                 qParams.Add("tor[cat][]", "0");
             }
 
-            string urlSearch = SearchUrl;
+            var urlSearch = SearchUrl;
             if (qParams.Count > 0)
             {
                 urlSearch += $"?{qParams.GetQueryString()}";
diff --git a/src/Jackett.Common/Indexers/NCore.cs b/src/Jackett.Common/Indexers/NCore.cs
index f3f11254a..a8ae5fe2c 100644
--- a/src/Jackett.Common/Indexers/NCore.cs
+++ b/src/Jackett.Common/Indexers/NCore.cs
@@ -20,7 +20,7 @@ namespace Jackett.Common.Indexers
     {
         private string LoginUrl { get { return SiteLink + "login.php"; } }
         private string SearchUrl { get { return SiteLink + "torrents.php"; } }
-        private string[] LanguageCats = new string[] { "xvidser", "dvdser", "hdser", "xvid", "dvd", "dvd9", "hd", "mp3", "lossless", "ebook" };
+        private readonly string[] LanguageCats = new string[] { "xvidser", "dvdser", "hdser", "xvid", "dvd", "dvd9", "hd", "mp3", "lossless", "ebook" };
 
         private new ConfigurationDataNCore configData
         {
@@ -117,7 +117,7 @@ namespace Jackett.Common.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        List<ReleaseInfo> parseTorrents(WebClientStringResult results, String seasonep, TorznabQuery query, int already_founded, int limit, int previously_parsed_on_page)
+        private List<ReleaseInfo> parseTorrents(WebClientStringResult results, string seasonep, TorznabQuery query, int already_founded, int limit, int previously_parsed_on_page)
         {
             var releases = new List<ReleaseInfo>();
             try
@@ -128,11 +128,11 @@ namespace Jackett.Common.Indexers
                 var rows = dom[".box_torrent_all"].Find(".box_torrent");
 
                 // Check torrents only till we reach the query Limit 
-                for (int i = previously_parsed_on_page; (i < rows.Length && ((already_founded + releases.Count) < limit)); i++)
+                for (var i = previously_parsed_on_page; (i < rows.Length && ((already_founded + releases.Count) < limit)); i++)
                 {
                     try
                     {
-                        CQ qRow = rows[i].Cq();
+                        var qRow = rows[i].Cq();
                         var key = dom["link[rel=alternate]"].First().Attr("href").Split('=').Last();
 
                         release = new ReleaseInfo();
@@ -146,8 +146,8 @@ namespace Jackett.Common.Indexers
                         release.DownloadVolumeFactor = 0;
                         release.UploadVolumeFactor = 1;
 
-                        string downloadLink = SiteLink + torrentTxt.GetAttribute("href");
-                        string downloadId = downloadLink.Substring(downloadLink.IndexOf("&id=") + 4);
+                        var downloadLink = SiteLink + torrentTxt.GetAttribute("href");
+                        var downloadId = downloadLink.Substring(downloadLink.IndexOf("&id=") + 4);
 
                         release.Link = new Uri(SiteLink.ToString() + "torrents.php?action=download&id=" + downloadId + "&key=" + key);
                         release.Comments = new Uri(SiteLink.ToString() + "torrents.php?action=details&id=" + downloadId);
@@ -160,16 +160,16 @@ namespace Jackett.Common.Indexers
                         var banner = qRow.Find("img.infobar_ico").Attr("onmouseover");
                         if (banner != null)
                         {
-                            Regex BannerRegEx = new Regex(@"mutat\('(.*?)', '", RegexOptions.Compiled);
+                            var BannerRegEx = new Regex(@"mutat\('(.*?)', '", RegexOptions.Compiled);
                             var BannerMatch = BannerRegEx.Match(banner);
                             var bannerurl = BannerMatch.Groups[1].Value;
                             release.BannerUrl = new Uri(bannerurl);
                         }
                         release.PublishDate = DateTime.Parse(qRow.Find(".box_feltoltve2").Get(0).InnerHTML.Replace("<br />", " "), CultureInfo.InvariantCulture);
-                        string[] sizeSplit = qRow.Find(".box_meret2").Get(0).InnerText.Split(' ');
+                        var sizeSplit = qRow.Find(".box_meret2").Get(0).InnerText.Split(' ');
                         release.Size = ReleaseInfo.GetBytes(sizeSplit[1].ToLower(), ParseUtil.CoerceFloat(sizeSplit[0]));
-                        string catlink = qRow.Find("a:has(img[class='categ_link'])").First().Attr("href");
-                        string cat = ParseUtil.GetArgumentFromQueryString(catlink, "tipus");
+                        var catlink = qRow.Find("a:has(img[class='categ_link'])").First().Attr("href");
+                        var cat = ParseUtil.GetArgumentFromQueryString(catlink, "tipus");
                         release.Category = MapTrackerCatToNewznab(cat);
 
                         /* if the release name not contains the language we add it because it is know from category */
@@ -187,14 +187,14 @@ namespace Jackett.Common.Indexers
                                 var temp = release.Title;
 
                                 // releasedata everithing after Name.S0Xe0X
-                                String releasedata = release.Title.Split(new[] { seasonep }, StringSplitOptions.None)[1].Trim();
+                                var releasedata = release.Title.Split(new[] { seasonep }, StringSplitOptions.None)[1].Trim();
 
                                 /* if the release name not contains the language we add it because it is know from category */
                                 if (cat.Contains("hun") && !releasedata.Contains("hun"))
                                     releasedata += ".hun";
 
                                 // release description contains [imdb: ****] but we only need the data before it for title
-                                String[] description = { release.Description, "" };
+                                string[] description = { release.Description, "" };
                                 if (release.Description.Contains("[imdb:"))
                                 {
                                     description = release.Description.Split('[');
@@ -204,7 +204,7 @@ namespace Jackett.Common.Indexers
                                 release.Title = (description[0].Trim() + "." + seasonep.Trim() + "." + releasedata.Trim('.')).Replace(' ', '.');
 
                                 // if search is done for S0X than we dont want to put . between S0X and E0X 
-                                Match match = Regex.Match(releasedata, @"^E\d\d?");
+                                var match = Regex.Match(releasedata, @"^E\d\d?");
                                 if (seasonep.Length == 3 && match.Success)
                                     release.Title = (description[0].Trim() + "." + seasonep.Trim() + releasedata.Trim('.')).Replace(' ', '.');
 
@@ -230,7 +230,7 @@ namespace Jackett.Common.Indexers
             return releases;
         }
 
-        protected async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query, String seasonep)
+        protected async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query, string seasonep)
         {
             var releases = new List<ReleaseInfo>();
             var searchString = query.GetQueryString();
@@ -271,14 +271,14 @@ namespace Jackett.Common.Indexers
 
 
             CQ dom = results.Content;
-            int numVal = 0;
+            var numVal = 0;
 
             // find number of torrents / page
-            int torrent_per_page = dom[".box_torrent_all"].Find(".box_torrent").Length;
+            var torrent_per_page = dom[".box_torrent_all"].Find(".box_torrent").Length;
             if (torrent_per_page == 0)
                 return releases;
-            int start_page = (query.Offset / torrent_per_page) + 1;
-            int previously_parsed_on_page = query.Offset - (start_page * torrent_per_page) + 1; //+1 because indexing start from 0
+            var start_page = (query.Offset / torrent_per_page) + 1;
+            var previously_parsed_on_page = query.Offset - (start_page * torrent_per_page) + 1; //+1 because indexing start from 0
             if (previously_parsed_on_page < 0)
                 previously_parsed_on_page = query.Offset;
 
@@ -287,13 +287,13 @@ namespace Jackett.Common.Indexers
             if (pagelinks.Length > 0)
             {
                 // If there are several pages find the link for the latest one
-                for (int i = pagelinks.Length - 1; i > 0; i--)
+                for (var i = pagelinks.Length - 1; i > 0; i--)
                 {
                     var last_page_link = (pagelinks[i].Cq().Attr("href")).Trim();
                     if (last_page_link.Contains("oldal"))
                     {
-                        Match match = Regex.Match(last_page_link, @"(?<=[\?,&]oldal=)(\d+)(?=&)");
-                        numVal = Int32.Parse(match.Value);
+                        var match = Regex.Match(last_page_link, @"(?<=[\?,&]oldal=)(\d+)(?=&)");
+                        numVal = int.Parse(match.Value);
                         break;
                     }
                 }
@@ -313,7 +313,7 @@ namespace Jackett.Common.Indexers
 
             // Check all the pages for the torrents.
             // The starting index is 2. (the first one is the original where we parse out the pages.)
-            for (int i = start_page; (i <= numVal && releases.Count < limit); i++)
+            for (var i = start_page; (i <= numVal && releases.Count < limit); i++)
             {
                 pairs.Add(new KeyValuePair<string, string>("oldal", i.ToString()));
                 results = await PostDataWithCookiesAndRetry(SearchUrl, pairs);
diff --git a/src/Jackett.Common/Indexers/NewRealWorld.cs b/src/Jackett.Common/Indexers/NewRealWorld.cs
index 6fcd394b6..e956aa824 100644
--- a/src/Jackett.Common/Indexers/NewRealWorld.cs
+++ b/src/Jackett.Common/Indexers/NewRealWorld.cs
@@ -118,12 +118,12 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
-            TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
-            TimeSpan delta = new TimeSpan(1, 0, 0);
-            TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
+            var startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
+            var endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
+            var delta = new TimeSpan(1, 0, 0);
+            var adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
             TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
-            TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
+            var germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
 
             var releases = new List<ReleaseInfo>();
 
@@ -141,7 +141,7 @@ namespace Jackett.Common.Indexers
             }
 
             var cats = MapTorznabCapsToTrackers(query);
-            string cat = "0";
+            var cat = "0";
             if (cats.Count == 1)
             {
                 cat = cats[0];
@@ -205,7 +205,7 @@ namespace Jackett.Common.Indexers
 
                     var dateStr = qDateStr.Text().Replace('\xA0', ' ');
                     var dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yyyy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
-                    DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
+                    var pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
                     release.PublishDate = pubDateUtc;
 
                     var files = qRow.Find("td:contains(Datei) > strong ~ strong").Text();
diff --git a/src/Jackett.Common/Indexers/Newpct.cs b/src/Jackett.Common/Indexers/Newpct.cs
index 822c2b5f4..6a3708d20 100644
--- a/src/Jackett.Common/Indexers/Newpct.cs
+++ b/src/Jackett.Common/Indexers/Newpct.cs
@@ -19,13 +19,13 @@ namespace Jackett.Common.Indexers
 {
     public class Newpct : BaseCachingWebIndexer
     {
-        enum ReleaseType
+        private enum ReleaseType
         {
             TV,
             Movie,
         }
 
-        class NewpctRelease : ReleaseInfo
+        private class NewpctRelease : ReleaseInfo
         {
             public ReleaseType NewpctReleaseType;
             public string SeriesName;
@@ -55,21 +55,21 @@ namespace Jackett.Common.Indexers
             }
         }
 
-        class DownloadMatcher
+        private class DownloadMatcher
         {
             public Regex MatchRegex;
             public MatchEvaluator MatchEvaluator;
         }
 
-        private static Uri DefaultSiteLinkUri =
+        private static readonly Uri DefaultSiteLinkUri =
             new Uri("https://descargas2020.org");
 
-        private static Uri[] ExtraSiteLinkUris = new Uri[]
+        private static readonly Uri[] ExtraSiteLinkUris = new Uri[]
         {
             new Uri("https://pctnew.org"),
         };
 
-        private static Uri[] LegacySiteLinkUris = new Uri[]
+        private static readonly Uri[] LegacySiteLinkUris = new Uri[]
         {
             new Uri("http://descargas2020.com/"),
             new Uri("http://www.tvsinpagar.com/"),
@@ -82,13 +82,13 @@ namespace Jackett.Common.Indexers
         };
 
         private NewpctRelease _mostRecentRelease;
-        private char[] _wordSeparators = new char[] { ' ', '.', ',', ';', '(', ')', '[', ']', '-', '_' };
-        private int _wordNotFoundScore = 100000;
-        private Regex _searchStringRegex = new Regex(@"(.+?)S0?(\d+)(E0?(\d+))?$", RegexOptions.IgnoreCase);
-        private Regex _titleListRegex = new Regex(@"Serie( *Descargar)?(.+?)(Temporada(.+?)(\d+)(.+?))?Capitulos?(.+?)(\d+)((.+?)(\d+))?(.+?)-(.+?)Calidad(.*)", RegexOptions.IgnoreCase);
-        private Regex _titleClassicRegex = new Regex(@"(\[[^\]]*\])?\[Cap\.(\d{1,2})(\d{2})([_-](\d{1,2})(\d{2}))?\]", RegexOptions.IgnoreCase);
-        private Regex _titleClassicTvQualityRegex = new Regex(@"\[([^\]]*HDTV[^\]]*)", RegexOptions.IgnoreCase);
-        private DownloadMatcher[] _downloadMatchers = new DownloadMatcher[]
+        private readonly char[] _wordSeparators = new char[] { ' ', '.', ',', ';', '(', ')', '[', ']', '-', '_' };
+        private readonly int _wordNotFoundScore = 100000;
+        private readonly Regex _searchStringRegex = new Regex(@"(.+?)S0?(\d+)(E0?(\d+))?$", RegexOptions.IgnoreCase);
+        private readonly Regex _titleListRegex = new Regex(@"Serie( *Descargar)?(.+?)(Temporada(.+?)(\d+)(.+?))?Capitulos?(.+?)(\d+)((.+?)(\d+))?(.+?)-(.+?)Calidad(.*)", RegexOptions.IgnoreCase);
+        private readonly Regex _titleClassicRegex = new Regex(@"(\[[^\]]*\])?\[Cap\.(\d{1,2})(\d{2})([_-](\d{1,2})(\d{2}))?\]", RegexOptions.IgnoreCase);
+        private readonly Regex _titleClassicTvQualityRegex = new Regex(@"\[([^\]]*HDTV[^\]]*)", RegexOptions.IgnoreCase);
+        private readonly DownloadMatcher[] _downloadMatchers = new DownloadMatcher[]
         {
             new DownloadMatcher()
             {
@@ -101,11 +101,11 @@ namespace Jackett.Common.Indexers
             },
         };
 
-        private int _maxDailyPages = 7;
-        private int _maxMoviesPages = 30;
-        private int _maxEpisodesListPages = 100;
-        private int[] _allTvCategories = (new TorznabCategory[] { TorznabCatType.TV }).Concat(TorznabCatType.TV.SubCategories).Select(c => c.ID).ToArray();
-        private int[] _allMoviesCategories = (new TorznabCategory[] { TorznabCatType.Movies }).Concat(TorznabCatType.Movies.SubCategories).Select(c => c.ID).ToArray();
+        private readonly int _maxDailyPages = 7;
+        private readonly int _maxMoviesPages = 30;
+        private readonly int _maxEpisodesListPages = 100;
+        private readonly int[] _allTvCategories = (new TorznabCategory[] { TorznabCatType.TV }).Concat(TorznabCatType.TV.SubCategories).Select(c => c.ID).ToArray();
+        private readonly int[] _allMoviesCategories = (new TorznabCategory[] { TorznabCatType.Movies }).Concat(TorznabCatType.Movies.SubCategories).Select(c => c.ID).ToArray();
 
         private bool _includeVo;
         private bool _filterMovies;
@@ -113,13 +113,13 @@ namespace Jackett.Common.Indexers
         private DateTime _dailyNow;
         private int _dailyResultIdx;
 
-        private string _searchUrl = "/buscar";
-        private string _searchJsonUrl = "/get/result/";
-        private string _dailyUrl = "/ultimas-descargas/pg/{0}";
-        private string[] _seriesLetterUrls = new string[] { "/series/letter/{0}", "/series-hd/letter/{0}" };
-        private string[] _seriesVOLetterUrls = new string[] { "/series-vo/letter/{0}" };
-        private string _seriesUrl = "{0}/pg/{1}";
-        private string[] _voUrls = new string[] { "serie-vo", "serievo" };
+        private readonly string _searchUrl = "/buscar";
+        private readonly string _searchJsonUrl = "/get/result/";
+        private readonly string _dailyUrl = "/ultimas-descargas/pg/{0}";
+        private readonly string[] _seriesLetterUrls = new string[] { "/series/letter/{0}", "/series-hd/letter/{0}" };
+        private readonly string[] _seriesVOLetterUrls = new string[] { "/series-vo/letter/{0}" };
+        private readonly string _seriesUrl = "{0}/pg/{1}";
+        private readonly string[] _voUrls = new string[] { "serie-vo", "serievo" };
 
         public override string[] LegacySiteLinks { get; protected set; } = LegacySiteLinkUris.Select(u => u.AbsoluteUri).ToArray();
 
@@ -166,7 +166,7 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            Uri link = new Uri(configData.SiteLink.Value);
+            var link = new Uri(configData.SiteLink.Value);
 
             lock (cache)
             {
@@ -178,9 +178,9 @@ namespace Jackett.Common.Indexers
 
         public override async Task<byte[]> Download(Uri linkParam)
         {
-            IEnumerable<Uri> uris = GetLinkUris(linkParam);
+            var uris = GetLinkUris(linkParam);
 
-            foreach (Uri uri in uris)
+            foreach (var uri in uris)
             {
                 byte[] result = null;
 
@@ -192,7 +192,7 @@ namespace Jackett.Common.Indexers
 
                     if (content != null)
                     {
-                        Uri uriLink = ExtractDownloadUri(content, uri.AbsoluteUri);
+                        var uriLink = ExtractDownloadUri(content, uri.AbsoluteUri);
                         if (uriLink != null)
                             result = await base.Download(uriLink);
                     }
@@ -204,7 +204,7 @@ namespace Jackett.Common.Indexers
                 if (result != null)
                     return result;
                 else
-                    this.logger.Warn("Newpct - download link not found in " + uri.LocalPath);
+                    logger.Warn("Newpct - download link not found in " + uri.LocalPath);
             }
 
             return null;
@@ -212,9 +212,9 @@ namespace Jackett.Common.Indexers
 
         private Uri ExtractDownloadUri(string content, string baseLink)
         {
-            foreach (DownloadMatcher matcher in _downloadMatchers)
+            foreach (var matcher in _downloadMatchers)
             {
-                Match match = matcher.MatchRegex.Match(content);
+                var match = matcher.MatchRegex.Match(content);
                 if (match.Success)
                 {
                     string linkText;
@@ -231,9 +231,9 @@ namespace Jackett.Common.Indexers
             return null;
         }
 
-        IEnumerable<Uri> GetLinkUris(Uri referenceLink)
+        private IEnumerable<Uri> GetLinkUris(Uri referenceLink)
         {
-            List<Uri> uris = new List<Uri>();
+            var uris = new List<Uri>();
             uris.Add(referenceLink);
             if (DefaultSiteLinkUri.Scheme != referenceLink.Scheme && DefaultSiteLinkUri.Host != referenceLink.Host)
                 uris.Add(DefaultSiteLinkUri);
@@ -243,11 +243,11 @@ namespace Jackett.Common.Indexers
                     (u.Scheme != referenceLink.Scheme || u.Host != referenceLink.Host) &&
                     (u.Scheme != DefaultSiteLinkUri.Scheme || u.Host != DefaultSiteLinkUri.Host))).ToList();
 
-            List<Uri> result = new List<Uri>();
+            var result = new List<Uri>();
 
-            foreach (Uri uri in uris)
+            foreach (var uri in uris)
             {
-                UriBuilder ub = new UriBuilder(uri);
+                var ub = new UriBuilder(uri);
                 ub.Path = referenceLink.LocalPath;
                 result.Add(ub.Uri);
             }
@@ -264,11 +264,11 @@ namespace Jackett.Common.Indexers
             _removeMovieAccents = ((BoolItem)configData.GetDynamic("RemoveMovieAccents")).Value;
             _dailyNow = DateTime.Now;
             _dailyResultIdx = 0;
-            bool rssMode = string.IsNullOrEmpty(query.SanitizedSearchTerm);
+            var rssMode = string.IsNullOrEmpty(query.SanitizedSearchTerm);
 
             if (rssMode)
             {
-                int pg = 1;
+                var pg = 1;
                 Uri validUri = null;
                 while (pg <= _maxDailyPages)
                 {
@@ -277,7 +277,7 @@ namespace Jackett.Common.Indexers
 
                     if (validUri != null)
                     {
-                        Uri uri = new Uri(validUri, string.Format(_dailyUrl, pg));
+                        var uri = new Uri(validUri, string.Format(_dailyUrl, pg));
                         results = await RequestStringWithCookiesAndRetry(uri.AbsoluteUri);
                         if (results == null || string.IsNullOrEmpty(results.Content))
                             break;
@@ -286,7 +286,7 @@ namespace Jackett.Common.Indexers
                     }
                     else
                     {
-                        foreach (Uri uri in GetLinkUris(new Uri(siteLink, string.Format(_dailyUrl, pg))))
+                        foreach (var uri in GetLinkUris(new Uri(siteLink, string.Format(_dailyUrl, pg))))
                         {
                             results = await RequestStringWithCookiesAndRetry(uri.AbsoluteUri);
                             if (results != null && !string.IsNullOrEmpty(results.Content))
@@ -308,7 +308,7 @@ namespace Jackett.Common.Indexers
                     releases.AddRange(items);
 
                     //Check if we need to go to next page
-                    bool recentFound = _mostRecentRelease != null &&
+                    var recentFound = _mostRecentRelease != null &&
                         items.Any(r => r.Title == _mostRecentRelease.Title && r.Link.AbsoluteUri == _mostRecentRelease.Link.AbsoluteUri);
                     if (pg == 1)
                         _mostRecentRelease = (NewpctRelease)items.First().Clone();
@@ -320,14 +320,14 @@ namespace Jackett.Common.Indexers
             }
             else
             {
-                bool isTvSearch = query.Categories == null || query.Categories.Length == 0 ||
+                var isTvSearch = query.Categories == null || query.Categories.Length == 0 ||
                     query.Categories.Any(c => _allTvCategories.Contains(c));
                 if (isTvSearch)
                 {
                     releases.AddRange(await TvSearch(siteLink, query));
                 }
 
-                bool isMovieSearch = query.Categories == null || query.Categories.Length == 0 ||
+                var isMovieSearch = query.Categories == null || query.Categories.Length == 0 ||
                     query.Categories.Any(c => _allMoviesCategories.Contains(c));
                 if (isMovieSearch)
                 {
@@ -346,16 +346,16 @@ namespace Jackett.Common.Indexers
         {
             List<ReleaseInfo> newpctReleases = null;
 
-            string seriesName = query.SanitizedSearchTerm;
-            int? season = query.Season > 0 ? (int?)query.Season : null;
+            var seriesName = query.SanitizedSearchTerm;
+            var season = query.Season > 0 ? (int?)query.Season : null;
             int? episode = null;
-            if (!string.IsNullOrWhiteSpace(query.Episode) && int.TryParse(query.Episode, out int episodeTemp))
+            if (!string.IsNullOrWhiteSpace(query.Episode) && int.TryParse(query.Episode, out var episodeTemp))
                 episode = episodeTemp;
 
             //If query has no season/episode info, try to parse title
             if (season == null && episode == null)
             {
-                Match searchMatch = _searchStringRegex.Match(query.SanitizedSearchTerm);
+                var searchMatch = _searchStringRegex.Match(query.SanitizedSearchTerm);
                 if (searchMatch.Success)
                 {
                     seriesName = searchMatch.Groups[1].Value.Trim();
@@ -377,7 +377,7 @@ namespace Jackett.Common.Indexers
                 newpctReleases = new List<ReleaseInfo>();
 
                 //Search series url
-                foreach (Uri seriesListUrl in SeriesListUris(siteLink, seriesName))
+                foreach (var seriesListUrl in SeriesListUris(siteLink, seriesName))
                 {
                     newpctReleases.AddRange(await GetReleasesFromUri(seriesListUrl, seriesName));
                 }
@@ -386,7 +386,7 @@ namespace Jackett.Common.Indexers
                 if (newpctReleases.Count == 0 && !(seriesName.ToLower().StartsWith("the")))
                 {
                     seriesName = "The " + seriesName;
-                    foreach (Uri seriesListUrl in SeriesListUris(siteLink, seriesName))
+                    foreach (var seriesListUrl in SeriesListUris(siteLink, seriesName))
                     {
                         newpctReleases.AddRange(await GetReleasesFromUri(seriesListUrl, seriesName));
                     }
@@ -405,7 +405,7 @@ namespace Jackett.Common.Indexers
             //Filter only episodes needed
             return newpctReleases.Where(r =>
             {
-                NewpctRelease nr = r as NewpctRelease;
+                var nr = r as NewpctRelease;
                 return (
                     nr.Season.HasValue != season.HasValue || //Can't determine if same season
                     nr.Season.HasValue && season.Value == nr.Season.Value && //Same season and ...
@@ -428,13 +428,13 @@ namespace Jackett.Common.Indexers
             await FollowIfRedirect(results);
 
             //Episodes list
-            string seriesEpisodesUrl = ParseSeriesListContent(results.Content, seriesName);
+            var seriesEpisodesUrl = ParseSeriesListContent(results.Content, seriesName);
             if (!string.IsNullOrEmpty(seriesEpisodesUrl))
             {
-                int pg = 1;
+                var pg = 1;
                 while (pg < _maxEpisodesListPages)
                 {
-                    Uri episodesListUrl = new Uri(string.Format(_seriesUrl, seriesEpisodesUrl, pg));
+                    var episodesListUrl = new Uri(string.Format(_seriesUrl, seriesEpisodesUrl, pg));
                     results = await RequestStringWithCookiesAndRetry(episodesListUrl.AbsoluteUri);
                     await FollowIfRedirect(results);
 
@@ -461,7 +461,7 @@ namespace Jackett.Common.Indexers
             {
                 lettersUrl = _seriesLetterUrls.Concat(_seriesVOLetterUrls);
             }
-            string seriesLetter = !char.IsDigit(seriesName[0]) ? seriesName[0].ToString() : "0-9";
+            var seriesLetter = !char.IsDigit(seriesName[0]) ? seriesName[0].ToString() : "0-9";
             return lettersUrl.Select(urlFormat =>
             {
                 return new Uri(siteLink, string.Format(urlFormat, seriesLetter.ToLower()));
@@ -473,7 +473,7 @@ namespace Jackett.Common.Indexers
             var SearchResultParser = new HtmlParser();
             var doc = SearchResultParser.ParseDocument(content);
 
-            List<NewpctRelease> releases = new List<NewpctRelease>();
+            var releases = new List<NewpctRelease>();
 
             try
             {
@@ -492,7 +492,7 @@ namespace Jackett.Common.Indexers
 
                     var span = row.QuerySelector("span");
                     var quality = span.ChildNodes[0].TextContent.Trim();
-                    ReleaseType releaseType = ReleaseTypeFromQuality(quality);
+                    var releaseType = ReleaseTypeFromQuality(quality);
                     var sizeText = span.ChildNodes[1].TextContent.Replace("Tama\u00F1o", "").Trim();
 
                     var div = row.QuerySelector("div");
@@ -525,7 +525,7 @@ namespace Jackett.Common.Indexers
             var SearchResultParser = new HtmlParser();
             var doc = SearchResultParser.ParseDocument(content);
 
-            Dictionary<string, string> results = new Dictionary<string, string>();
+            var results = new Dictionary<string, string>();
 
             try
             {
@@ -550,7 +550,7 @@ namespace Jackett.Common.Indexers
             var SearchResultParser = new HtmlParser();
             var doc = SearchResultParser.ParseDocument(content);
 
-            List<NewpctRelease> releases = new List<NewpctRelease>();
+            var releases = new List<NewpctRelease>();
 
             try
             {
@@ -565,9 +565,9 @@ namespace Jackett.Common.Indexers
                     var pubDateText = row.ChildNodes[3].TextContent.Trim();
                     var sizeText = row.ChildNodes[5].TextContent.Trim();
 
-                    long size = ReleaseInfo.GetBytes(sizeText);
-                    DateTime publishDate = DateTime.ParseExact(pubDateText, "dd-MM-yyyy", null);
-                    NewpctRelease newpctRelease = GetReleaseFromData(ReleaseType.TV, title, detailsUrl, null, null, size, publishDate);
+                    var size = ReleaseInfo.GetBytes(sizeText);
+                    var publishDate = DateTime.ParseExact(pubDateText, "dd-MM-yyyy", null);
+                    var newpctRelease = GetReleaseFromData(ReleaseType.TV, title, detailsUrl, null, null, size, publishDate);
 
                     releases.Add(newpctRelease);
                 }
@@ -584,13 +584,13 @@ namespace Jackett.Common.Indexers
         {
             var releases = new List<NewpctRelease>();
 
-            string searchStr = query.SanitizedSearchTerm;
+            var searchStr = query.SanitizedSearchTerm;
             if (_removeMovieAccents)
                 searchStr = RemoveDiacritics(searchStr);
 
             Uri validUri = null;
-            bool validUriUsesJson = false;
-            int pg = 1;
+            var validUriUsesJson = false;
+            var pg = 1;
             while (pg <= _maxMoviesPages)
             {
                 var queryCollection = new Dictionary<string, string>();
@@ -605,7 +605,7 @@ namespace Jackett.Common.Indexers
                 {
                     if (validUriUsesJson)
                     {
-                        Uri uri = new Uri(validUri, _searchJsonUrl);
+                        var uri = new Uri(validUri, _searchJsonUrl);
                         results = await PostDataWithCookies(uri.AbsoluteUri, queryCollection);
                         if (results == null || string.IsNullOrEmpty(results.Content))
                             break;
@@ -613,7 +613,7 @@ namespace Jackett.Common.Indexers
                     }
                     else
                     {
-                        Uri uri = new Uri(validUri, _searchUrl);
+                        var uri = new Uri(validUri, _searchUrl);
                         results = await PostDataWithCookies(uri.AbsoluteUri, queryCollection);
                         if (results == null || string.IsNullOrEmpty(results.Content))
                             break;
@@ -626,12 +626,12 @@ namespace Jackett.Common.Indexers
                     {
                         using (var uris = GetLinkUris(new Uri(siteLink, _searchUrl)).GetEnumerator())
                         {
-                            bool resultFound = false;
+                            var resultFound = false;
                             while (jsonUris.MoveNext() && uris.MoveNext() && !resultFound)
                             {
-                                for (int i = 0; i < 2 && !resultFound; i++)
+                                for (var i = 0; i < 2 && !resultFound; i++)
                                 {
-                                    bool usingJson = i == 0;
+                                    var usingJson = i == 0;
 
                                     Uri uri;
                                     if (usingJson)
@@ -685,11 +685,11 @@ namespace Jackett.Common.Indexers
 
         private IEnumerable<NewpctRelease> ParseSearchContent(string content)
         {
-            bool someFound = false;
+            var someFound = false;
             var SearchResultParser = new HtmlParser();
             var doc = SearchResultParser.ParseDocument(content);
 
-            List<NewpctRelease> releases = new List<NewpctRelease>();
+            var releases = new List<NewpctRelease>();
 
             try
             {
@@ -705,8 +705,8 @@ namespace Jackett.Common.Indexers
 
                     someFound = true;
 
-                    bool isSeries = h2.QuerySelector("span") != null && h2.TextContent.ToLower().Contains("calidad");
-                    bool isGame = title.ToLower().Contains("pcdvd");
+                    var isSeries = h2.QuerySelector("span") != null && h2.TextContent.ToLower().Contains("calidad");
+                    var isGame = title.ToLower().Contains("pcdvd");
                     if (isSeries || isGame)
                         continue;
 
@@ -723,8 +723,7 @@ namespace Jackett.Common.Indexers
                     catch
                     {
                     }
-                    DateTime publishDate;
-                    DateTime.TryParseExact(pubDateText, "dd-MM-yyyy", null, DateTimeStyles.None, out publishDate);
+                    DateTime.TryParseExact(pubDateText, "dd-MM-yyyy", null, DateTimeStyles.None, out var publishDate);
 
                     var div = row.QuerySelector("div");
 
@@ -747,12 +746,12 @@ namespace Jackett.Common.Indexers
 
         private IEnumerable<NewpctRelease> ParseSearchJsonContent(Uri uri, string content)
         {
-            bool someFound = false;
+            var someFound = false;
 
-            List<NewpctRelease> releases = new List<NewpctRelease>();
+            var releases = new List<NewpctRelease>();
 
             //Remove path from uri
-            UriBuilder ub = new UriBuilder(uri);
+            var ub = new UriBuilder(uri);
             ub.Path = string.Empty;
             uri = ub.Uri;
 
@@ -760,21 +759,21 @@ namespace Jackett.Common.Indexers
             {
                 var jo = JObject.Parse(content);
 
-                int numItems = int.Parse(jo["data"]["items"].ToString());
-                for (int i = 0; i < numItems; i++)
+                var numItems = int.Parse(jo["data"]["items"].ToString());
+                for (var i = 0; i < numItems; i++)
                 {
                     var item = jo["data"]["torrents"]["0"][i.ToString()];
 
-                    string url = item["guid"].ToString();
-                    string title = item["torrentName"].ToString();
-                    string pubDateText = item["torrentDateAdded"].ToString();
-                    string calidad = item["calidad"].ToString();
-                    string sizeText = item["torrentSize"].ToString();
+                    var url = item["guid"].ToString();
+                    var title = item["torrentName"].ToString();
+                    var pubDateText = item["torrentDateAdded"].ToString();
+                    var calidad = item["calidad"].ToString();
+                    var sizeText = item["torrentSize"].ToString();
 
                     someFound = true;
 
-                    bool isSeries = calidad != null && calidad.ToLower().Contains("hdtv");
-                    bool isGame = title.ToLower().Contains("pcdvd");
+                    var isSeries = calidad != null && calidad.ToLower().Contains("hdtv");
+                    var isGame = title.ToLower().Contains("pcdvd");
                     if (isSeries || isGame)
                         continue;
 
@@ -786,11 +785,10 @@ namespace Jackett.Common.Indexers
                     catch
                     {
                     }
-                    DateTime publishDate;
-                    DateTime.TryParseExact(pubDateText, "dd/MM/yyyy", null, DateTimeStyles.None, out publishDate);
+                    DateTime.TryParseExact(pubDateText, "dd/MM/yyyy", null, DateTimeStyles.None, out var publishDate);
 
                     NewpctRelease newpctRelease;
-                    string detailsUrl = new Uri(uri, url).AbsoluteUri;
+                    var detailsUrl = new Uri(uri, url).AbsoluteUri;
                     newpctRelease = GetReleaseFromData(ReleaseType.Movie, title, detailsUrl, calidad, null, size, publishDate);
 
                     releases.Add(newpctRelease);
@@ -812,20 +810,20 @@ namespace Jackett.Common.Indexers
 
         private void ScoreReleases(IEnumerable<NewpctRelease> releases, string searchTerm)
         {
-            string[] searchWords = searchTerm.ToLower().Split(_wordSeparators, StringSplitOptions.None).
+            var searchWords = searchTerm.ToLower().Split(_wordSeparators, StringSplitOptions.None).
                 Select(s => s.Trim()).
                 Where(s => !string.IsNullOrEmpty(s)).ToArray();
 
-            foreach (NewpctRelease release in releases)
+            foreach (var release in releases)
             {
                 release.Score = 0;
-                string[] releaseWords = release.Title.ToLower().Split(_wordSeparators, StringSplitOptions.None).
+                var releaseWords = release.Title.ToLower().Split(_wordSeparators, StringSplitOptions.None).
                     Select(s => s.Trim()).
                     Where(s => !string.IsNullOrEmpty(s)).ToArray();
 
-                foreach (string search in searchWords)
+                foreach (var search in searchWords)
                 {
-                    int index = Array.IndexOf(releaseWords, search);
+                    var index = Array.IndexOf(releaseWords, search);
                     if (index >= 0)
                     {
                         release.Score += index;
@@ -839,7 +837,7 @@ namespace Jackett.Common.Indexers
             }
         }
 
-        ReleaseType ReleaseTypeFromQuality(string quality)
+        private ReleaseType ReleaseTypeFromQuality(string quality)
         {
             if (quality.Trim().ToLower().StartsWith("hdtv"))
                 return ReleaseType.TV;
@@ -847,36 +845,36 @@ namespace Jackett.Common.Indexers
                 return ReleaseType.Movie;
         }
 
-        NewpctRelease GetReleaseFromData(ReleaseType releaseType, string title, string detailsUrl, string quality, string language, long size, DateTime publishDate)
+        private NewpctRelease GetReleaseFromData(ReleaseType releaseType, string title, string detailsUrl, string quality, string language, long size, DateTime publishDate)
         {
-            NewpctRelease result = new NewpctRelease();
+            var result = new NewpctRelease();
             result.NewpctReleaseType = releaseType;
 
             //Sanitize
             title = title.Replace("\t", "").Replace("\x2013", "-");
 
-            Match match = _titleListRegex.Match(title);
+            var match = _titleListRegex.Match(title);
             if (match.Success)
             {
                 result.SeriesName = match.Groups[2].Value.Trim(' ', '-');
                 result.Season = int.Parse(match.Groups[5].Success ? match.Groups[5].Value.Trim() : "1");
                 result.Episode = int.Parse(match.Groups[8].Value.Trim().PadLeft(2, '0'));
                 result.EpisodeTo = match.Groups[11].Success ? (int?)int.Parse(match.Groups[11].Value.Trim()) : null;
-                string audioQuality = match.Groups[13].Value.Trim(' ', '[', ']');
+                var audioQuality = match.Groups[13].Value.Trim(' ', '[', ']');
                 if (string.IsNullOrEmpty(language))
                     language = audioQuality;
                 quality = match.Groups[14].Value.Trim(' ', '[', ']');
 
-                string seasonText = result.Season.ToString();
-                string episodeText = seasonText + result.Episode.ToString().PadLeft(2, '0');
-                string episodeToText = result.EpisodeTo.HasValue ? "_" + seasonText + result.EpisodeTo.ToString().PadLeft(2, '0') : "";
+                var seasonText = result.Season.ToString();
+                var episodeText = seasonText + result.Episode.ToString().PadLeft(2, '0');
+                var episodeToText = result.EpisodeTo.HasValue ? "_" + seasonText + result.EpisodeTo.ToString().PadLeft(2, '0') : "";
 
                 result.Title = string.Format("{0} - Temporada {1} [{2}][Cap.{3}{4}][{5}]",
                     result.SeriesName, seasonText, quality, episodeText, episodeToText, audioQuality);
             }
             else
             {
-                Match matchClassic = _titleClassicRegex.Match(title);
+                var matchClassic = _titleClassicRegex.Match(title);
                 if (matchClassic.Success)
                 {
                     result.Season = matchClassic.Groups[2].Success ? (int?)int.Parse(matchClassic.Groups[2].Value) : null;
@@ -922,7 +920,7 @@ namespace Jackett.Common.Indexers
 
         private string FixedTitle(NewpctRelease release, string quality, string language)
         {
-            if (String.IsNullOrEmpty(release.SeriesName))
+            if (string.IsNullOrEmpty(release.SeriesName))
             {
                 release.SeriesName = release.Title;
                 if (release.NewpctReleaseType == ReleaseType.TV && release.SeriesName.Contains("-"))
@@ -935,7 +933,7 @@ namespace Jackett.Common.Indexers
 
             if (release.NewpctReleaseType == ReleaseType.TV)
             {
-                if (String.IsNullOrEmpty(quality))
+                if (string.IsNullOrEmpty(quality))
                     quality = "HDTV";
 
                 var seasonAndEpisode = "S" + release.Season.ToString().PadLeft(2, '0');
@@ -965,7 +963,7 @@ namespace Jackett.Common.Indexers
                 titleParts.Add("Spanish");
             }
 
-            string result = String.Join(".", titleParts);
+            var result = string.Join(".", titleParts);
 
             result = Regex.Replace(result, @"[\[\]]+", ".");
             result = Regex.Replace(result, @"\.[ \.]*\.", ".");
diff --git a/src/Jackett.Common/Indexers/Norbits.cs b/src/Jackett.Common/Indexers/Norbits.cs
index 9fcac128c..874073651 100644
--- a/src/Jackett.Common/Indexers/Norbits.cs
+++ b/src/Jackett.Common/Indexers/Norbits.cs
@@ -342,7 +342,7 @@ namespace Jackett.Common.Indexers
                         Output("Leechers: " + leechers);
 
                         // Completed
-                        Regex regexObj = new Regex(@"[^\d]");
+                        var regexObj = new Regex(@"[^\d]");
                         var completed2 = tRow.Find("td:eq(7)").Text();
                         var completed = ParseUtil.CoerceLong(regexObj.Replace(completed2, ""));
                         Output("Completed: " + completed);
@@ -377,7 +377,7 @@ namespace Jackett.Common.Indexers
                         // Torrent Download URL
                         var passkey = tRow.Find("td:eq(1) > a:eq(1)").Attr("href");
                         var key = Regex.Match(passkey, "(?<=passkey\\=)([a-zA-z0-9]*)");
-                        Uri downloadLink = new Uri(TorrentDownloadUrl.Replace("{id}", id.ToString()).Replace("{passkey}", key.ToString()));
+                        var downloadLink = new Uri(TorrentDownloadUrl.Replace("{id}", id.ToString()).Replace("{passkey}", key.ToString()));
                         Output("Download Link: " + downloadLink.AbsoluteUri);
 
                         // Building release infos
@@ -441,7 +441,7 @@ namespace Jackett.Common.Indexers
         {
             var parameters = new NameValueCollection();
             var categoriesList = MapTorznabCapsToTrackers(query);
-            string searchterm = term;
+            var searchterm = term;
 
             // Building our tracker query
             parameters.Add("incldead", "1");
diff --git a/src/Jackett.Common/Indexers/Nordicbits.cs b/src/Jackett.Common/Indexers/Nordicbits.cs
index 4eb307779..c83fa9799 100644
--- a/src/Jackett.Common/Indexers/Nordicbits.cs
+++ b/src/Jackett.Common/Indexers/Nordicbits.cs
@@ -345,25 +345,25 @@ namespace Jackett.Common.Indexers
                         var name = tRow.Find("td:eq(1) > a:eq(0)").Text();
 
                         // Category
-                        string categoryID = tRow.Find("td:eq(0) > a:eq(0)").Attr("href").Split('?').Last();
+                        var categoryID = tRow.Find("td:eq(0) > a:eq(0)").Attr("href").Split('?').Last();
                         var newznab = MapTrackerCatToNewznab(categoryID);
                         Output("Category: " + (newznab.Count > 0 ? newznab.First().ToString() : "unknown category") + " (" + categoryID + ")");
 
                         // Seeders
-                        int seeders = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(9)").Text(), @"\d+").Value);
+                        var seeders = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(9)").Text(), @"\d+").Value);
                         Output("Seeders: " + seeders);
 
                         // Leechers
-                        int leechers = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(10)").Text(), @"\d+").Value);
+                        var leechers = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(10)").Text(), @"\d+").Value);
                         Output("Leechers: " + leechers);
 
                         // Files
-                        int files = 1;
+                        var files = 1;
                         files = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(4)").Text(), @"\d+").Value);
                         Output("Files: " + files);
 
                         // Completed
-                        int completed = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(8)").Text(), @"\d+").Value);
+                        var completed = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(8)").Text(), @"\d+").Value);
                         Output("Completed: " + completed);
 
                         // Size
@@ -376,7 +376,7 @@ namespace Jackett.Common.Indexers
                         var datestr = Regex.Replace(dateTimeOrig, @"<[^>]+>|&nbsp;", "").Trim();
                         datestr = Regex.Replace(datestr, "Today", DateTime.Now.ToString("MMM dd yyyy"), RegexOptions.IgnoreCase);
                         datestr = Regex.Replace(datestr, "Yesterday", DateTime.Now.Date.AddDays(-1).ToString("MMM dd yyyy"), RegexOptions.IgnoreCase);
-                        DateTime date = DateTimeUtil.FromUnknown(datestr, "DK");
+                        var date = DateTimeUtil.FromUnknown(datestr, "DK");
                         Output("Released on: " + date);
 
                         // Torrent Details URL
@@ -390,7 +390,7 @@ namespace Jackett.Common.Indexers
                         // Torrent Download URL
                         var passkey = tRow.Find("td:eq(2) > a:eq(0)").Attr("href");
                         var key = Regex.Match(passkey, "(?<=torrent_pass\\=)([a-zA-z0-9]*)");
-                        Uri downloadLink = new Uri(TorrentDownloadUrl.Replace("{id}", id.ToString()).Replace("{passkey}", key.ToString()));
+                        var downloadLink = new Uri(TorrentDownloadUrl.Replace("{id}", id.ToString()).Replace("{passkey}", key.ToString()));
                         Output("Download Link: " + downloadLink.AbsoluteUri);
 
                         // Building release infos
@@ -450,7 +450,7 @@ namespace Jackett.Common.Indexers
         {
             var parameters = new NameValueCollection();
             var categoriesList = MapTorznabCapsToTrackers(query);
-            string searchterm = term;
+            var searchterm = term;
 
             // Building our tracker query
             parameters.Add("searchin", "title");
@@ -473,7 +473,7 @@ namespace Jackett.Common.Indexers
             }
 
             // Loop on categories and change the catagories for search purposes
-            for (int i = 0; i < categoriesList.Count; i++)
+            for (var i = 0; i < categoriesList.Count; i++)
             {
                 // APPS
                 if (new[] { "63", "17", "12", "62", "64" }.Any(c => categoriesList[i].Contains(categoriesList[i])))
diff --git a/src/Jackett.Common/Indexers/Partis.cs b/src/Jackett.Common/Indexers/Partis.cs
index bf7e8ead2..9ac38a159 100644
--- a/src/Jackett.Common/Indexers/Partis.cs
+++ b/src/Jackett.Common/Indexers/Partis.cs
@@ -98,7 +98,7 @@ namespace Jackett.Common.Indexers
                 { "user[password]", configData.Password.Value }
             };
 
-            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, String.Empty, false, null, null, true);
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, string.Empty, false, null, null, true);
             await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("/odjava"), () =>
             {
                 CQ dom = result.Content;
@@ -115,8 +115,8 @@ namespace Jackett.Common.Indexers
 
             WebClientStringResult results = null;
             var queryCollection = new NameValueCollection();
-            List<string> catList = MapTorznabCapsToTrackers(query);     // map categories from query to indexer specific
-            var categ = String.Join(",", catList);
+            var catList = MapTorznabCapsToTrackers(query);     // map categories from query to indexer specific
+            var categ = string.Join(",", catList);
 
             //create GET request - search URI
             queryCollection.Add("offset", "0");
@@ -153,7 +153,7 @@ namespace Jackett.Common.Indexers
             // parse results
             try
             {
-                string RowsSelector = "div.list > div[name=\"torrrow\"]";
+                var RowsSelector = "div.list > div[name=\"torrrow\"]";
 
                 var ResultParser = new HtmlParser();
                 var SearchResultDocument = ResultParser.ParseDocument(results.Content);
@@ -182,8 +182,8 @@ namespace Jackett.Common.Indexers
 
                         // Date of torrent creation
                         var liopis = Row.QuerySelector("div.listeklink div span.middle");
-                        int ind = liopis.TextContent.IndexOf("Naloženo:");
-                        String reldate = liopis.TextContent.Substring(ind + 10, 22);
+                        var ind = liopis.TextContent.IndexOf("Naloženo:");
+                        var reldate = liopis.TextContent.Substring(ind + 10, 22);
                         release.PublishDate = DateTime.ParseExact(reldate, "dd.MM.yyyy ob HH:mm:ss", CultureInfo.InvariantCulture);
 
                         // Is freeleech?
diff --git a/src/Jackett.Common/Indexers/PassThePopcorn.cs b/src/Jackett.Common/Indexers/PassThePopcorn.cs
index 5e569c968..59ba482e3 100644
--- a/src/Jackett.Common/Indexers/PassThePopcorn.cs
+++ b/src/Jackett.Common/Indexers/PassThePopcorn.cs
@@ -89,13 +89,13 @@ namespace Jackett.Common.Indexers
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            bool configGoldenPopcornOnly = configData.FilterString.Value.ToLowerInvariant().Contains("goldenpopcorn");
-            bool configSceneOnly = configData.FilterString.Value.ToLowerInvariant().Contains("scene");
-            bool configCheckedOnly = configData.FilterString.Value.ToLowerInvariant().Contains("checked");
-            bool configFreeOnly = configData.FilterString.Value.ToLowerInvariant().Contains("free");
+            var configGoldenPopcornOnly = configData.FilterString.Value.ToLowerInvariant().Contains("goldenpopcorn");
+            var configSceneOnly = configData.FilterString.Value.ToLowerInvariant().Contains("scene");
+            var configCheckedOnly = configData.FilterString.Value.ToLowerInvariant().Contains("checked");
+            var configFreeOnly = configData.FilterString.Value.ToLowerInvariant().Contains("free");
 
 
-            string movieListSearchUrl = SearchUrl;
+            var movieListSearchUrl = SearchUrl;
             var queryCollection = new NameValueCollection();
             queryCollection.Add("json", "noredirect");
 
@@ -130,11 +130,11 @@ namespace Jackett.Common.Indexers
             try
             {
                 //Iterate over the releases for each movie
-                JObject js_results = JObject.Parse(results.Content);
+                var js_results = JObject.Parse(results.Content);
                 foreach (var movie in js_results["Movies"])
                 {
-                    string movie_title = (string)movie["Title"];
-                    string Year = (string)movie["Year"];
+                    var movie_title = (string)movie["Title"];
+                    var Year = (string)movie["Year"];
                     var movie_imdbid_str = (string)movie["ImdbId"];
                     var coverStr = (string)movie["Cover"];
                     Uri coverUri = null;
@@ -143,11 +143,11 @@ namespace Jackett.Common.Indexers
                     long? movie_imdbid = null;
                     if (!string.IsNullOrEmpty(movie_imdbid_str))
                         movie_imdbid = long.Parse(movie_imdbid_str);
-                    string movie_groupid = (string)movie["GroupId"];
+                    var movie_groupid = (string)movie["GroupId"];
                     foreach (var torrent in movie["Torrents"])
                     {
                         var release = new ReleaseInfo();
-                        string release_name = (string)torrent["ReleaseName"];
+                        var release_name = (string)torrent["ReleaseName"];
                         release.Title = release_name;
                         release.Description = string.Format("Title: {0}", movie_title);
                         release.BannerUrl = coverUri;
@@ -168,10 +168,9 @@ namespace Jackett.Common.Indexers
                         release.UploadVolumeFactor = 1;
                         release.Category = new List<int> { 2000 };
 
-                        bool golden, scene, check;
-                        bool.TryParse((string)torrent["GoldenPopcorn"], out golden);
-                        bool.TryParse((string)torrent["Scene"], out scene);
-                        bool.TryParse((string)torrent["Checked"], out check);
+                        bool.TryParse((string)torrent["GoldenPopcorn"], out var golden);
+                        bool.TryParse((string)torrent["Scene"], out var scene);
+                        bool.TryParse((string)torrent["Checked"], out var check);
 
                         if (configGoldenPopcornOnly && !golden)
                         {
@@ -187,11 +186,11 @@ namespace Jackett.Common.Indexers
                         }
 
                         var titletags = new List<string>();
-                        string Quality = (string)torrent["Quality"];
-                        string Container = (string)torrent["Container"];
-                        string Codec = (string)torrent["Codec"];
-                        string Resolution = (string)torrent["Resolution"];
-                        string Source = (string)torrent["Source"];
+                        var Quality = (string)torrent["Quality"];
+                        var Container = (string)torrent["Container"];
+                        var Codec = (string)torrent["Codec"];
+                        var Resolution = (string)torrent["Resolution"];
+                        var Source = (string)torrent["Source"];
 
                         if (Year != null)
                         {
@@ -240,8 +239,7 @@ namespace Jackett.Common.Indexers
                         if (titletags.Count() > 0)
                             release.Title += " [" + string.Join(" / ", titletags) + "]";
 
-                        bool freeleech;
-                        bool.TryParse((string)torrent["FreeleechType"], out freeleech);
+                        bool.TryParse((string)torrent["FreeleechType"], out var freeleech);
                         if (freeleech)
                             release.DownloadVolumeFactor = 0;
 
diff --git a/src/Jackett.Common/Indexers/PiXELHD.cs b/src/Jackett.Common/Indexers/PiXELHD.cs
index 819674039..63da62953 100644
--- a/src/Jackett.Common/Indexers/PiXELHD.cs
+++ b/src/Jackett.Common/Indexers/PiXELHD.cs
@@ -142,7 +142,7 @@ namespace Jackett.Common.Indexers
                 results = await RequestStringWithCookies(searchUrl);
             }
 
-            Regex IMDBRegEx = new Regex(@"tt(\d+)", RegexOptions.Compiled);
+            var IMDBRegEx = new Regex(@"tt(\d+)", RegexOptions.Compiled);
             var hParser = new HtmlParser();
             var ResultDocument = hParser.ParseDocument(results.Content);
             try
diff --git a/src/Jackett.Common/Indexers/PirateTheNet.cs b/src/Jackett.Common/Indexers/PirateTheNet.cs
index 088d251e4..9276b5050 100644
--- a/src/Jackett.Common/Indexers/PirateTheNet.cs
+++ b/src/Jackett.Common/Indexers/PirateTheNet.cs
@@ -21,8 +21,8 @@ namespace Jackett.Common.Indexers
         private string SearchUrl { get { return SiteLink + "torrentsutils.php"; } }
         private string LoginUrl { get { return SiteLink + "takelogin.php"; } }
         private string CaptchaUrl { get { return SiteLink + "simpleCaptcha.php?numImages=1"; } }
-        private TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "W. Europe Standard Time", "W. Europe Standard Time");
-        private readonly List<String> categories = new List<string>() { "1080P", "720P", "BDRip", "BluRay", "BRRip", "DVDR", "DVDRip", "FLAC", "MP3", "MP4", "Packs", "R5", "Remux", "TVRip", "WebRip" };
+        private readonly TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "W. Europe Standard Time", "W. Europe Standard Time");
+        private readonly List<string> categories = new List<string>() { "1080P", "720P", "BDRip", "BluRay", "BRRip", "DVDR", "DVDRip", "FLAC", "MP3", "MP4", "Packs", "R5", "Remux", "TVRip", "WebRip" };
 
         private new ConfigurationDataBasicLoginWithRSSAndDisplay configData
         {
@@ -45,8 +45,8 @@ namespace Jackett.Common.Indexers
             Language = "en-us";
             Type = "private";
 
-            this.configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show the maximum.";
-            this.configData.DisplayText.Name = "Notice";
+            configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show the maximum.";
+            configData.DisplayText.Name = "Notice";
 
             AddCategoryMapping("1080P", TorznabCatType.MoviesHD, "1080P");
             AddCategoryMapping("720P", TorznabCatType.MoviesHD, "720P");
@@ -92,7 +92,7 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+            var releases = new List<ReleaseInfo>();
 
             var searchString = query.GetQueryString();
             var searchUrl = SearchUrl;
@@ -119,7 +119,7 @@ namespace Jackett.Common.Indexers
             }
 
             var cats = MapTorznabCapsToTrackers(query);
-            queryCollection.Add("hiddenqualities", String.Join(",", cats));
+            queryCollection.Add("hiddenqualities", string.Join(",", cats));
 
             searchUrl += "?" + queryCollection.GetQueryString();
 
diff --git a/src/Jackett.Common/Indexers/Pretome.cs b/src/Jackett.Common/Indexers/Pretome.cs
index c186e950a..2a4a81c27 100644
--- a/src/Jackett.Common/Indexers/Pretome.cs
+++ b/src/Jackett.Common/Indexers/Pretome.cs
@@ -22,7 +22,7 @@ namespace Jackett.Common.Indexers
         private string LoginReferer { get { return SiteLink + "index.php?cat=1"; } }
         private string SearchUrl { get { return SiteLink + "browse.php"; } }
 
-        private List<CategoryMapping> resultMapping = new List<CategoryMapping>();
+        private readonly List<CategoryMapping> resultMapping = new List<CategoryMapping>();
 
         private new ConfigurationDataPinNumber configData
         {
@@ -283,7 +283,7 @@ namespace Jackett.Common.Indexers
                 var rows = dom["table > tbody > tr.browse"];
                 foreach (var row in rows)
                 {
-                    CQ qRow = row.Cq();
+                    var qRow = row.Cq();
                     var release = new ReleaseInfo();
 
                     release.MinimumRatio = 1;
diff --git a/src/Jackett.Common/Indexers/Rarbg.cs b/src/Jackett.Common/Indexers/Rarbg.cs
index 32b33e6a3..7c19e4793 100644
--- a/src/Jackett.Common/Indexers/Rarbg.cs
+++ b/src/Jackett.Common/Indexers/Rarbg.cs
@@ -38,7 +38,7 @@ namespace Jackett.Common.Indexers
 
         private DateTime lastTokenFetch;
         private string token;
-        private string app_id;
+        private readonly string app_id;
         private bool _provideTorrentLink;
         private string _sort;
 
diff --git a/src/Jackett.Common/Indexers/RevolutionTT.cs b/src/Jackett.Common/Indexers/RevolutionTT.cs
index 62757977b..400993b6f 100644
--- a/src/Jackett.Common/Indexers/RevolutionTT.cs
+++ b/src/Jackett.Common/Indexers/RevolutionTT.cs
@@ -259,8 +259,7 @@ namespace Jackett.Common.Indexers
                     long? imdbID = null;
                     if (imdbMatch.Success)
                     {
-                        long l;
-                        if (long.TryParse(imdbMatch.Value, out l))
+                        if (long.TryParse(imdbMatch.Value, out var l))
                         {
                             imdbID = l;
                         }
@@ -321,7 +320,7 @@ namespace Jackett.Common.Indexers
                     CQ dom = results.Content;
 
                     //  table header is the first <tr> in table body, get all rows except this
-                    CQ qRows = dom["#torrents-table > tbody > tr:not(:first-child)"];
+                    var qRows = dom["#torrents-table > tbody > tr:not(:first-child)"];
 
                     foreach (var row in qRows)
                     {
@@ -334,7 +333,7 @@ namespace Jackett.Common.Indexers
                         release.MinimumRatio = 1;
                         release.MinimumSeedTime = 172800; // 48 hours
 
-                        CQ qLink = qRow.Find(".br_right > a").First();
+                        var qLink = qRow.Find(".br_right > a").First();
                         release.Guid = new Uri(SiteLink + qLink.Attr("href"));
                         release.Comments = new Uri(SiteLink + qLink.Attr("href"));
                         release.Title = qLink.Find("b").Text();
diff --git a/src/Jackett.Common/Indexers/SceneHD.cs b/src/Jackett.Common/Indexers/SceneHD.cs
index 5da32f61b..99d8107a1 100644
--- a/src/Jackett.Common/Indexers/SceneHD.cs
+++ b/src/Jackett.Common/Indexers/SceneHD.cs
@@ -84,16 +84,16 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
-            TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
-            TimeSpan delta = new TimeSpan(1, 0, 0);
-            TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
+            var startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
+            var endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
+            var delta = new TimeSpan(1, 0, 0);
+            var adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
             TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
-            TimeZoneInfo Tz = TimeZoneInfo.CreateCustomTimeZone("custom", new TimeSpan(1, 0, 0), "custom", "custom", "custom", adjustments);
+            var Tz = TimeZoneInfo.CreateCustomTimeZone("custom", new TimeSpan(1, 0, 0), "custom", "custom", "custom", adjustments);
 
             var releases = new List<ReleaseInfo>();
 
-            NameValueCollection qParams = new NameValueCollection();
+            var qParams = new NameValueCollection();
             qParams.Add("api", "");
             if (query.ImdbIDShort != null)
                 qParams.Add("imdb", query.ImdbIDShort);
@@ -105,7 +105,7 @@ namespace Jackett.Common.Indexers
                 qParams.Add("categories[" + cat + "]", "1");
             }
 
-            string urlSearch = SearchUrl;
+            var urlSearch = SearchUrl;
             urlSearch += "?" + qParams.GetQueryString();
 
             var response = await RequestStringWithCookiesAndRetry(urlSearch);
diff --git a/src/Jackett.Common/Indexers/SceneTime.cs b/src/Jackett.Common/Indexers/SceneTime.cs
index 522473bd5..33ec456fc 100644
--- a/src/Jackett.Common/Indexers/SceneTime.cs
+++ b/src/Jackett.Common/Indexers/SceneTime.cs
@@ -108,7 +108,7 @@ namespace Jackett.Common.Indexers
         {
             var loginPage = await RequestStringWithCookies(StartPageUrl, string.Empty);
             CQ cq = loginPage.Content;
-            var result = this.configData;
+            var result = configData;
             result.Captcha.Version = "2";
             CQ recaptcha = cq.Find(".g-recaptcha").Attr("data-sitekey");
             if (recaptcha.Length != 0)
@@ -176,8 +176,8 @@ namespace Jackett.Common.Indexers
             qParams.Add("cata", "yes");
             qParams.Add("sec", "jax");
 
-            List<string> catList = MapTorznabCapsToTrackers(query);
-            foreach (string cat in catList)
+            var catList = MapTorznabCapsToTrackers(query);
+            foreach (var cat in catList)
             {
                 qParams.Add("c" + cat, "1");
             }
@@ -195,25 +195,25 @@ namespace Jackett.Common.Indexers
             var searchUrl = SearchUrl + "?" + qParams.GetQueryString();
 
             var results = await RequestStringWithCookies(searchUrl);
-            List<ReleaseInfo> releases = ParseResponse(query, results.Content);
+            var releases = ParseResponse(query, results.Content);
 
             return releases;
         }
 
         public List<ReleaseInfo> ParseResponse(TorznabQuery query, string htmlResponse)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+            var releases = new List<ReleaseInfo>();
 
             try
             {
                 CQ dom = htmlResponse;
 
-                List<string> headerColumns = dom["table[class*='movehere']"].First().Find("tbody > tr > td[class='cat_Head']").Select(x => x.Cq().Text()).ToList();
-                int categoryIndex = headerColumns.FindIndex(x => x.Equals("Type"));
-                int nameIndex = headerColumns.FindIndex(x => x.Equals("Name"));
-                int sizeIndex = headerColumns.FindIndex(x => x.Equals("Size"));
-                int seedersIndex = headerColumns.FindIndex(x => x.Equals("Seeders"));
-                int leechersIndex = headerColumns.FindIndex(x => x.Equals("Leechers"));
+                var headerColumns = dom["table[class*='movehere']"].First().Find("tbody > tr > td[class='cat_Head']").Select(x => x.Cq().Text()).ToList();
+                var categoryIndex = headerColumns.FindIndex(x => x.Equals("Type"));
+                var nameIndex = headerColumns.FindIndex(x => x.Equals("Name"));
+                var sizeIndex = headerColumns.FindIndex(x => x.Equals("Size"));
+                var seedersIndex = headerColumns.FindIndex(x => x.Equals("Seeders"));
+                var leechersIndex = headerColumns.FindIndex(x => x.Equals("Leechers"));
 
                 var rows = dom["tr.browse"];
                 foreach (var row in rows)
@@ -223,10 +223,10 @@ namespace Jackett.Common.Indexers
                     release.MinimumSeedTime = 172800; // 48 hours
 
                     var categoryCol = row.ChildElements.ElementAt(categoryIndex);
-                    string catLink = categoryCol.Cq().Find("a").Attr("href");
+                    var catLink = categoryCol.Cq().Find("a").Attr("href");
                     if (catLink != null)
                     {
-                        string catId = new Regex(@"\?cat=(\d*)").Match(catLink).Groups[1].ToString().Trim();
+                        var catId = new Regex(@"\?cat=(\d*)").Match(catLink).Groups[1].ToString().Trim();
                         release.Category = MapTrackerCatToNewznab(catId);
                     }
 
diff --git a/src/Jackett.Common/Indexers/ShowRSS.cs b/src/Jackett.Common/Indexers/ShowRSS.cs
index 7e0d0d7ea..cf30b645f 100644
--- a/src/Jackett.Common/Indexers/ShowRSS.cs
+++ b/src/Jackett.Common/Indexers/ShowRSS.cs
@@ -24,7 +24,7 @@ namespace Jackett.Common.Indexers
 
         private new ConfigurationData configData
         {
-            get { return (ConfigurationData)base.configData; }
+            get { return base.configData; }
             set { base.configData = value; }
         }
 
@@ -91,7 +91,7 @@ namespace Jackett.Common.Indexers
                     release.Comments = new Uri(node.SelectSingleNode("link").InnerText);
 
                     // Try to guess the category... I'm not proud of myself...
-                    int category = 5030;
+                    var category = 5030;
                     if (serie_title.Contains("720p"))
                         category = 5040;
                     release.Category = new List<int> { category };
diff --git a/src/Jackett.Common/Indexers/SolidTorrents.cs b/src/Jackett.Common/Indexers/SolidTorrents.cs
index 8a20a1c82..65675e663 100644
--- a/src/Jackett.Common/Indexers/SolidTorrents.cs
+++ b/src/Jackett.Common/Indexers/SolidTorrents.cs
@@ -29,7 +29,7 @@ namespace Jackett.Common.Indexers
 
         private ConfigurationData ConfigData
         {
-            get => (ConfigurationData)base.configData;
+            get => configData;
             set => base.configData = value;
         }
 
diff --git a/src/Jackett.Common/Indexers/SpeedCD.cs b/src/Jackett.Common/Indexers/SpeedCD.cs
index d12d033f1..9fb6105a1 100644
--- a/src/Jackett.Common/Indexers/SpeedCD.cs
+++ b/src/Jackett.Common/Indexers/SpeedCD.cs
@@ -110,7 +110,7 @@ namespace Jackett.Common.Indexers
         {
             var releases = new List<ReleaseInfo>();
 
-            NameValueCollection qParams = new NameValueCollection();
+            var qParams = new NameValueCollection();
 
             if (!string.IsNullOrWhiteSpace(query.ImdbID))
             {
@@ -122,13 +122,13 @@ namespace Jackett.Common.Indexers
                 qParams.Add("search", query.GetQueryString());
             }
 
-            List<string> catList = MapTorznabCapsToTrackers(query);
-            foreach (string cat in catList)
+            var catList = MapTorznabCapsToTrackers(query);
+            foreach (var cat in catList)
             {
                 qParams.Add("c" + cat, "1");
             }
 
-            string urlSearch = SearchUrl;
+            var urlSearch = SearchUrl;
             if (qParams.Count > 0)
             {
                 urlSearch += $"?{qParams.GetQueryString()}";
@@ -147,26 +147,25 @@ namespace Jackett.Common.Indexers
                 CQ dom = response.Content;
                 var rows = dom["div[id='torrentTable'] > div[class^='box torrentBox'] > div[class='boxContent'] > table > tbody > tr"];
 
-                foreach (IDomObject row in rows)
+                foreach (var row in rows)
                 {
                     CQ torrentData = row.OuterHTML;
-                    CQ cells = row.Cq().Find("td");
+                    var cells = row.Cq().Find("td");
 
-                    string title = torrentData.Find("td[class='lft'] > div > a").First().Text().Trim();
-                    Uri link = new Uri(SiteLink + torrentData.Find("img[title='Download']").First().Parent().Attr("href").Trim());
-                    Uri guid = link;
-                    Uri comments = new Uri(SiteLink + torrentData.Find("td[class='lft'] > div > a").First().Attr("href").Trim().Remove(0, 1));
-                    long size = ReleaseInfo.GetBytes(cells.Elements.ElementAt(4).Cq().Text());
-                    int grabs = ParseUtil.CoerceInt(cells.Elements.ElementAt(5).Cq().Text());
-                    int seeders = ParseUtil.CoerceInt(cells.Elements.ElementAt(6).Cq().Text());
-                    int leechers = ParseUtil.CoerceInt(cells.Elements.ElementAt(7).Cq().Text());
+                    var title = torrentData.Find("td[class='lft'] > div > a").First().Text().Trim();
+                    var link = new Uri(SiteLink + torrentData.Find("img[title='Download']").First().Parent().Attr("href").Trim());
+                    var guid = link;
+                    var comments = new Uri(SiteLink + torrentData.Find("td[class='lft'] > div > a").First().Attr("href").Trim().Remove(0, 1));
+                    var size = ReleaseInfo.GetBytes(cells.Elements.ElementAt(4).Cq().Text());
+                    var grabs = ParseUtil.CoerceInt(cells.Elements.ElementAt(5).Cq().Text());
+                    var seeders = ParseUtil.CoerceInt(cells.Elements.ElementAt(6).Cq().Text());
+                    var leechers = ParseUtil.CoerceInt(cells.Elements.ElementAt(7).Cq().Text());
 
-                    string pubDateStr = torrentData.Find("span[class^='elapsedDate']").First().Attr("title").Trim().Replace(" at", "");
-                    DateTime publishDate = DateTime.ParseExact(pubDateStr, "dddd, MMMM d, yyyy h:mmtt", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal).ToLocalTime();
+                    var pubDateStr = torrentData.Find("span[class^='elapsedDate']").First().Attr("title").Trim().Replace(" at", "");
+                    var publishDate = DateTime.ParseExact(pubDateStr, "dddd, MMMM d, yyyy h:mmtt", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal).ToLocalTime();
 
-                    long category = 0;
-                    string cat = torrentData.Find("img[class^='Tcat']").First().Parent().Attr("href").Trim().Remove(0, 5);
-                    long.TryParse(cat, out category);
+                    var cat = torrentData.Find("img[class^='Tcat']").First().Parent().Attr("href").Trim().Remove(0, 5);
+                    long.TryParse(cat, out var category);
 
                     var release = new ReleaseInfo();
 
diff --git a/src/Jackett.Common/Indexers/Superbits.cs b/src/Jackett.Common/Indexers/Superbits.cs
index 57ef6da39..e234d7340 100644
--- a/src/Jackett.Common/Indexers/Superbits.cs
+++ b/src/Jackett.Common/Indexers/Superbits.cs
@@ -97,7 +97,7 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+            var releases = new List<ReleaseInfo>();
             var queryCollection = new NameValueCollection();
             var searchString = query.GetQueryString();
             var searchUrl = SearchUrl;
diff --git a/src/Jackett.Common/Indexers/TVVault.cs b/src/Jackett.Common/Indexers/TVVault.cs
index 3e06f992c..4fb4ad3d1 100644
--- a/src/Jackett.Common/Indexers/TVVault.cs
+++ b/src/Jackett.Common/Indexers/TVVault.cs
@@ -92,7 +92,7 @@ namespace Jackett.Common.Indexers
             var results = await RequestStringWithCookies(searchUrl);
             try
             {
-                string RowsSelector = "table.torrent_table > tbody > tr.torrent";
+                var RowsSelector = "table.torrent_table > tbody > tr.torrent";
 
                 var SearchResultParser = new HtmlParser();
                 var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
diff --git a/src/Jackett.Common/Indexers/TVstore.cs b/src/Jackett.Common/Indexers/TVstore.cs
index 9fce0429c..e59a0dd2e 100755
--- a/src/Jackett.Common/Indexers/TVstore.cs
+++ b/src/Jackett.Common/Indexers/TVstore.cs
@@ -24,8 +24,8 @@ namespace Jackett.Common.Indexers
         private string SearchUrl { get { return SiteLink + "torrent/br_process.php"; } }
         private string DownloadUrl { get { return SiteLink + "torrent/download.php"; } }
         private string BrowseUrl { get { return SiteLink + "torrent/browse.php"; } }
-        private List<SeriesDetail> series = new List<SeriesDetail>();
-        private Regex _searchStringRegex = new Regex(@"(.+?)S0?(\d+)(E0?(\d+))?$", RegexOptions.IgnoreCase);
+        private readonly List<SeriesDetail> series = new List<SeriesDetail>();
+        private readonly Regex _searchStringRegex = new Regex(@"(.+?)S0?(\d+)(E0?(\d+))?$", RegexOptions.IgnoreCase);
 
         private new ConfigurationDataTVstore configData
         {
@@ -86,7 +86,7 @@ namespace Jackett.Common.Indexers
         public double UploadFactorCalculator(DateTime dateTime, string type)
         {
             var today = DateTime.Now;
-            int dd = (today - dateTime).Days;
+            var dd = (today - dateTime).Days;
 
             /* In case of season Packs */
             if (type.Equals("season"))
@@ -116,53 +116,53 @@ namespace Jackett.Common.Indexers
         /// <param name="query">Query.</param>
         /// <param name="already_found">Number of the already found torrents.(used for limit)</param>
         /// <param name="limit">The limit to the number of torrents to download </param>
-        async Task<List<ReleaseInfo>> ParseTorrents(WebClientStringResult results, TorznabQuery query, int already_found, int limit, int previously_parsed_on_page)
+        private async Task<List<ReleaseInfo>> ParseTorrents(WebClientStringResult results, TorznabQuery query, int already_found, int limit, int previously_parsed_on_page)
         {
             var releases = new List<ReleaseInfo>();
             try
             {
-                String content = results.Content;
+                var content = results.Content;
                 /* Content Looks like this
                  * 2\15\2\1\1727\207244\1x08 \[WebDL-720p - Eng - AJP69]\gb\2018-03-09 08:11:53\akció, kaland, sci-fi \0\0\1\191170047\1\0\Anonymous\50\0\0\\0\4\0\174\0\
                  * 1\ 0\0\1\1727\207243\1x08 \[WebDL-1080p - Eng - AJP69]\gb\2018-03-09 08:11:49\akció, kaland, sci-fi \0\0\1\305729738\1\0\Anonymous\50\0\0\\0\8\0\102\0\0\0\0\1\\\
                  */
-                string[] parameters = content.Split(new string[] { "\\" }, StringSplitOptions.None);
-                string type = "normal";
+                var parameters = content.Split(new string[] { "\\" }, StringSplitOptions.None);
+                var type = "normal";
 
                 /* 
                  * Split the releases by '\' and go through them. 
                  * 27 element belongs to one torrent
                  */
-                for (int j = previously_parsed_on_page * 27; (j + 27 < parameters.Length && ((already_found + releases.Count) < limit)); j = j + 27)
+                for (var j = previously_parsed_on_page * 27; (j + 27 < parameters.Length && ((already_found + releases.Count) < limit)); j = j + 27)
                 {
-                    ReleaseInfo release = new ReleaseInfo();
+                    var release = new ReleaseInfo();
 
-                    int imdb_id = 4 + j;
-                    int torrent_id = 5 + j;
-                    int is_season_id = 6 + j;
-                    int publish_date_id = 9 + j;
-                    int files_id = 13 + j;
-                    int size_id = 14 + j;
-                    int seeders_id = 23;
-                    int peers_id = 24 + j;
-                    int grabs_id = 25 + j;
+                    var imdb_id = 4 + j;
+                    var torrent_id = 5 + j;
+                    var is_season_id = 6 + j;
+                    var publish_date_id = 9 + j;
+                    var files_id = 13 + j;
+                    var size_id = 14 + j;
+                    var seeders_id = 23;
+                    var peers_id = 24 + j;
+                    var grabs_id = 25 + j;
 
 
                     type = "normal";
                     //IMDB id of the series
-                    SeriesDetail seriesinfo = series.Find(x => x.id.Contains(parameters[imdb_id]));
+                    var seriesinfo = series.Find(x => x.id.Contains(parameters[imdb_id]));
                     if (seriesinfo != null && !parameters[imdb_id].Equals(""))
                         release.Imdb = long.Parse(seriesinfo.imdbid);
 
                     //ID of the torrent
-                    Int32 unixTimestamp = (Int32)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
+                    var unixTimestamp = (int)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
 
-                    string fileinfoURL = SearchUrl + "?func=getToggle&id=" + parameters[torrent_id] + "&w=F&pg=0&now=" + unixTimestamp;
-                    string fileinfo = (await RequestStringWithCookiesAndRetry(fileinfoURL)).Content;
+                    var fileinfoURL = SearchUrl + "?func=getToggle&id=" + parameters[torrent_id] + "&w=F&pg=0&now=" + unixTimestamp;
+                    var fileinfo = (await RequestStringWithCookiesAndRetry(fileinfoURL)).Content;
                     release.Link = new Uri(DownloadUrl + "?id=" + parameters[torrent_id]);
                     release.Guid = release.Link;
                     release.Comments = release.Link;
-                    string[] fileinf = fileinfo.Split(new string[] { "\\\\" }, StringSplitOptions.None);
+                    var fileinf = fileinfo.Split(new string[] { "\\\\" }, StringSplitOptions.None);
                     if (fileinf.Length > 1)
                     {
                         release.Title = fileinf[1];
@@ -215,7 +215,7 @@ namespace Jackett.Common.Indexers
         ///     - IMDB ID
         /// </summary>
         /// <returns>The series info.</returns>
-        protected async Task<Boolean> GetSeriesInfo()
+        protected async Task<bool> GetSeriesInfo()
         {
 
             var result = (await RequestStringWithCookiesAndRetry(BrowseUrl)).Content;
@@ -227,14 +227,14 @@ namespace Jackett.Common.Indexers
             {
                 if (script.TextContent.Contains("catsh=Array"))
                 {
-                    string[] seriesknowbysite = Regex.Split(script.TextContent, "catl");
-                    for (int i = 1; i < seriesknowbysite.Length; i++)
+                    var seriesknowbysite = Regex.Split(script.TextContent, "catl");
+                    for (var i = 1; i < seriesknowbysite.Length; i++)
                     {
                         try
                         {
                             var id = seriesknowbysite[i];
-                            string[] serieselement = WebUtility.HtmlDecode(id).Split(';');
-                            SeriesDetail sd = new SeriesDetail();
+                            var serieselement = WebUtility.HtmlDecode(id).Split(';');
+                            var sd = new SeriesDetail();
                             sd.HunName = serieselement[1].Split('=')[1].Trim('\'').ToLower();
                             sd.EngName = serieselement[2].Split('=')[1].Trim('\'').ToLower();
                             sd.id = serieselement[0].Split('=')[1].Trim('\'');
@@ -261,16 +261,16 @@ namespace Jackett.Common.Indexers
                 await GetSeriesInfo();
             }
 
-            Int32 unixTimestamp = (Int32)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
+            var unixTimestamp = (int)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
 
             WebClientStringResult results;
 
-            string searchString = "";
-            string exactSearchURL = "";
-            int page = 1;
+            var searchString = "";
+            var exactSearchURL = "";
+            var page = 1;
             SeriesDetail seriesinfo = null;
-            String base64coded = "";
-            bool noimdbmatch = false;
+            var base64coded = "";
+            var noimdbmatch = false;
             var limit = query.Limit;
             if (limit == 0)
                 limit = 100;
@@ -279,7 +279,7 @@ namespace Jackett.Common.Indexers
                 seriesinfo = series.Find(x => x.imdbid.Equals(query.ImdbIDShort));
                 if (seriesinfo != null && !query.ImdbIDShort.Equals(""))
                 {
-                    String querrySeason = "";
+                    var querrySeason = "";
                     if (query.Season != 0)
                         querrySeason = query.Season.ToString();
                     exactSearchURL = SearchUrl + "?s=" + querrySeason + "&e=" + query.Episode + "&g=" + seriesinfo.id + "&now=" + unixTimestamp.ToString();
@@ -300,7 +300,7 @@ namespace Jackett.Common.Indexers
                     // convert SnnEnn to nnxnn for dashboard searches
                     if (query.Season == 0 && (query.Episode == null || query.Episode.Equals("")))
                     {
-                        Match searchMatch = _searchStringRegex.Match(searchString);
+                        var searchMatch = _searchStringRegex.Match(searchString);
                         if (searchMatch.Success)
                         {
                             query.Season = int.Parse(searchMatch.Groups[2].Value);
@@ -332,21 +332,21 @@ namespace Jackett.Common.Indexers
             results = await RequestStringWithCookiesAndRetry(exactSearchURL);
 
             /* Parse page Information from result */
-            string content = results.Content;
+            var content = results.Content;
             var splits = content.Split('\\');
-            int max_found = int.Parse(splits[0]);
-            int torrent_per_page = int.Parse(splits[1]);
+            var max_found = int.Parse(splits[0]);
+            var torrent_per_page = int.Parse(splits[1]);
 
 
             if (torrent_per_page == 0)
                 return releases;
-            int start_page = (query.Offset / torrent_per_page) + 1;
-            int previously_parsed_on_page = query.Offset - (start_page * torrent_per_page) + 1; //+1 because indexing start from 0
+            var start_page = (query.Offset / torrent_per_page) + 1;
+            var previously_parsed_on_page = query.Offset - (start_page * torrent_per_page) + 1; //+1 because indexing start from 0
             if (previously_parsed_on_page <= 0)
                 previously_parsed_on_page = query.Offset;
 
 
-            double pages = Math.Ceiling((double)max_found / (double)torrent_per_page);
+            var pages = Math.Ceiling(max_found / (double)torrent_per_page);
 
             /* First page content is already ready */
             if (start_page == 1)
diff --git a/src/Jackett.Common/Indexers/TorrentDay.cs b/src/Jackett.Common/Indexers/TorrentDay.cs
index e0f1acb6a..2019ee67b 100644
--- a/src/Jackett.Common/Indexers/TorrentDay.cs
+++ b/src/Jackett.Common/Indexers/TorrentDay.cs
@@ -126,7 +126,7 @@ namespace Jackett.Common.Indexers
             if (loginPage.IsRedirect)
                 loginPage = await RequestStringWithCookies(loginPage.RedirectingTo, string.Empty);
             CQ cq = loginPage.Content;
-            var result = this.configData;
+            var result = configData;
 
             //result.CookieHeader.Value = loginPage.Cookies;
             UpdateCookieHeader(loginPage.Cookies); // update cookies instead of replacing them, see #3717
diff --git a/src/Jackett.Common/Indexers/TorrentHeaven.cs b/src/Jackett.Common/Indexers/TorrentHeaven.cs
index 3bc7dd4ee..451fd35fc 100755
--- a/src/Jackett.Common/Indexers/TorrentHeaven.cs
+++ b/src/Jackett.Common/Indexers/TorrentHeaven.cs
@@ -102,7 +102,7 @@ namespace Jackett.Common.Indexers
         {
             var loginPage = await RequestStringWithCookies(IndexUrl, string.Empty);
             CQ dom = loginPage.Content;
-            CQ qCaptchaImg = dom.Find("td.tablea > img").First();
+            var qCaptchaImg = dom.Find("td.tablea > img").First();
             if (qCaptchaImg.Length == 1)
             {
                 var CaptchaUrl = SiteLink + qCaptchaImg.Attr("src");
@@ -157,12 +157,12 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
-            TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
-            TimeSpan delta = new TimeSpan(1, 0, 0);
-            TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
+            var startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
+            var endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
+            var delta = new TimeSpan(1, 0, 0);
+            var adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
             TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
-            TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
+            var germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
 
             var releases = new List<ReleaseInfo>();
 
@@ -237,7 +237,7 @@ namespace Jackett.Common.Indexers
                     else
                         dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStrParts[0] + dateStrParts[1], "dd.MM.yyyyHH:mm", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
 
-                    DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
+                    var pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
                     release.PublishDate = pubDateUtc.ToLocalTime();
 
                     var grabs = qRow.Find("td:nth-child(7)").Text();
diff --git a/src/Jackett.Common/Indexers/TorrentLeech.cs b/src/Jackett.Common/Indexers/TorrentLeech.cs
index b56c6da40..5004de7d0 100644
--- a/src/Jackett.Common/Indexers/TorrentLeech.cs
+++ b/src/Jackett.Common/Indexers/TorrentLeech.cs
@@ -105,7 +105,7 @@ namespace Jackett.Common.Indexers
             var captcha = cq.Find(".g-recaptcha");
             if (captcha.Any())
             {
-                var result = this.configData;
+                var result = configData;
                 result.CookieHeader.Value = loginPage.Cookies;
                 result.Captcha.SiteKey = captcha.Attr("data-sitekey");
                 result.Captcha.Version = "2";
diff --git a/src/Jackett.Common/Indexers/TorrentNetwork.cs b/src/Jackett.Common/Indexers/TorrentNetwork.cs
index e3ec463a3..a8aaf8517 100644
--- a/src/Jackett.Common/Indexers/TorrentNetwork.cs
+++ b/src/Jackett.Common/Indexers/TorrentNetwork.cs
@@ -20,7 +20,7 @@ namespace Jackett.Common.Indexers
         private string APIUrl { get { return SiteLink + "api/"; } }
         private string passkey;
 
-        private Dictionary<string, string> APIHeaders = new Dictionary<string, string>()
+        private readonly Dictionary<string, string> APIHeaders = new Dictionary<string, string>()
         {
             {"Content-Type", "application/json"},
         };
diff --git a/src/Jackett.Common/Indexers/TorrentSyndikat.cs b/src/Jackett.Common/Indexers/TorrentSyndikat.cs
index ec64e7f63..d78cc7374 100644
--- a/src/Jackett.Common/Indexers/TorrentSyndikat.cs
+++ b/src/Jackett.Common/Indexers/TorrentSyndikat.cs
@@ -22,7 +22,7 @@ namespace Jackett.Common.Indexers
         private string SearchUrl { get { return SiteLink + "browse.php"; } }
         private string LoginUrl { get { return SiteLink + "eing2.php"; } }
         private string CaptchaUrl { get { return SiteLink + "simpleCaptcha.php?numImages=1"; } }
-        private TimeZoneInfo germanyTz;
+        private readonly TimeZoneInfo germanyTz;
 
         private new ConfigurationDataBasicLoginWithRSSAndDisplay configData
         {
@@ -47,8 +47,8 @@ namespace Jackett.Common.Indexers
 
             TorznabCaps.SupportsImdbMovieSearch = true;
 
-            this.configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show the maximum.";
-            this.configData.DisplayText.Name = "Notice";
+            configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show the maximum.";
+            configData.DisplayText.Name = "Notice";
 
             AddCategoryMapping(2, TorznabCatType.PC, "Apps / Windows");
             AddCategoryMapping(13, TorznabCatType.PC, "Apps / Linux");
@@ -95,10 +95,10 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(48, TorznabCatType.Other, "Englisch / Bildung");
             AddCategoryMapping(49, TorznabCatType.TVSport, "Englisch / Sport");
 
-            TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
-            TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
-            TimeSpan delta = new TimeSpan(1, 0, 0);
-            TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
+            var startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
+            var endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
+            var delta = new TimeSpan(1, 0, 0);
+            var adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
             TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
             germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
         }
@@ -131,7 +131,7 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+            var releases = new List<ReleaseInfo>();
 
             var searchString = query.GetQueryString();
             var searchUrl = SearchUrl;
@@ -154,7 +154,7 @@ namespace Jackett.Common.Indexers
                     // use AND+wildcard operator to avoid getting to many useless results
                     var searchStringArray = Regex.Split(searchString.Trim(), "[ _.-]+", RegexOptions.Compiled).ToList();
                     searchStringArray = searchStringArray.Select(x => "+" + x).ToList(); // add AND operators
-                    var searchStringFinal = String.Join(" ", searchStringArray);
+                    var searchStringFinal = string.Join(" ", searchStringArray);
                     queryCollection.Add("search", searchStringFinal);
                 }
 
@@ -199,7 +199,7 @@ namespace Jackett.Common.Indexers
                     var torrentTag = descCol.Cq().Find("span.torrent-tag");
                     var torrentTags = torrentTag.Elements.Select(x => x.InnerHTML).ToList();
                     release.Title = qCommentLink.Attr("title");
-                    release.Description = String.Join(", ", torrentTags);
+                    release.Description = string.Join(", ", torrentTags);
                     release.Comments = new Uri(SiteLink + qCommentLink.Attr("href").Replace("&hit=1", ""));
                     release.Guid = release.Comments;
 
@@ -214,7 +214,7 @@ namespace Jackett.Common.Indexers
                     else
                         dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yyyy HH:mm", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
 
-                    DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
+                    var pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
                     release.PublishDate = pubDateUtc.ToLocalTime();
 
                     var imdbLink = descCol.Cq().Find("a[href*=\"&searchin=imdb\"]");
diff --git a/src/Jackett.Common/Indexers/Torrentech.cs b/src/Jackett.Common/Indexers/Torrentech.cs
index 4996aa305..92d44bef3 100644
--- a/src/Jackett.Common/Indexers/Torrentech.cs
+++ b/src/Jackett.Common/Indexers/Torrentech.cs
@@ -103,7 +103,7 @@ namespace Jackett.Common.Indexers
             }
             try
             {
-                string RowsSelector = "div.borderwrap:has(div.maintitle) > table > tbody > tr:has(a[href*=\"index.php?showtopic=\"])";
+                var RowsSelector = "div.borderwrap:has(div.maintitle) > table > tbody > tr:has(a[href*=\"index.php?showtopic=\"])";
 
                 var SearchResultParser = new HtmlParser();
                 var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
diff --git a/src/Jackett.Common/Indexers/Torrentscsv.cs b/src/Jackett.Common/Indexers/Torrentscsv.cs
index 0527a32f7..1aa1c0ce9 100644
--- a/src/Jackett.Common/Indexers/Torrentscsv.cs
+++ b/src/Jackett.Common/Indexers/Torrentscsv.cs
@@ -21,7 +21,7 @@ namespace Jackett.Common.Indexers
 
         private new ConfigurationData configData
         {
-            get { return (ConfigurationData)base.configData; }
+            get { return base.configData; }
             set { base.configData = value; }
         }
 
@@ -104,7 +104,7 @@ namespace Jackett.Common.Indexers
                     release.Title = torrent.Value<string>("name");
 
                     // construct magnet link from infohash with all public trackers known to man
-                    string magnet_uri = "magnet:?xt=urn:btih:" + torrent.Value<JToken>("infohash") +
+                    var magnet_uri = "magnet:?xt=urn:btih:" + torrent.Value<JToken>("infohash") +
                         "&tr=udp://tracker.coppersurfer.tk:6969/announce" +
                         "&tr=udp://tracker.leechers-paradise.org:6969/announce" +
                         "&tr=udp://tracker.internetwarriors.net:1337/announce" +
@@ -148,7 +148,7 @@ namespace Jackett.Common.Indexers
 
                     // convert unix timestamp to human readable date
                     double createdunix = torrent.Value<long>("created_unix");
-                    System.DateTime dateTime = new System.DateTime(1970, 1, 1, 0, 0, 0, 0);
+                    var dateTime = new System.DateTime(1970, 1, 1, 0, 0, 0, 0);
                     dateTime = dateTime.AddSeconds(createdunix);
                     release.PublishDate = dateTime;
                     release.Seeders = torrent.Value<int>("seeders");
@@ -164,7 +164,7 @@ namespace Jackett.Common.Indexers
                     release.UploadVolumeFactor = 1;
 
                     // dummy mappings for sonarr, radarr, etc
-                    string categories = string.Join(";", MapTorznabCapsToTrackers(query));
+                    var categories = string.Join(";", MapTorznabCapsToTrackers(query));
                     if (!string.IsNullOrEmpty(categories))
                     {
                         if (categories.Contains("1000"))
diff --git a/src/Jackett.Common/Indexers/TransmitheNet.cs b/src/Jackett.Common/Indexers/TransmitheNet.cs
index 82e48d1ba..b8713cf32 100644
--- a/src/Jackett.Common/Indexers/TransmitheNet.cs
+++ b/src/Jackett.Common/Indexers/TransmitheNet.cs
@@ -88,18 +88,18 @@ namespace Jackett.Common.Indexers
             //    Url = SearchUrl;
             //else
             //{
-            string Url = $"{SearchUrl}&searchtext={WebUtility.UrlEncode(query.GetQueryString())}";
+            var Url = $"{SearchUrl}&searchtext={WebUtility.UrlEncode(query.GetQueryString())}";
             //}
 
             var response = await RequestStringWithCookiesAndRetry(Url);
-            List<ReleaseInfo> releases = ParseResponse(response.Content);
+            var releases = ParseResponse(response.Content);
 
             return releases;
         }
 
         public List<ReleaseInfo> ParseResponse(string htmlResponse)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+            var releases = new List<ReleaseInfo>();
 
             try
             {
@@ -116,7 +116,7 @@ namespace Jackett.Common.Indexers
                 {
                     var release = new ReleaseInfo();
 
-                    string title = row.QuerySelector("a[data-src]").GetAttribute("data-src");
+                    var title = row.QuerySelector("a[data-src]").GetAttribute("data-src");
                     if (string.IsNullOrEmpty(title) || title == "0")
                     {
                         title = row.QuerySelector("a[data-src]").TextContent;
diff --git a/src/Jackett.Common/Indexers/XSpeeds.cs b/src/Jackett.Common/Indexers/XSpeeds.cs
index 8d87f12a1..e72f8a1c6 100644
--- a/src/Jackett.Common/Indexers/XSpeeds.cs
+++ b/src/Jackett.Common/Indexers/XSpeeds.cs
@@ -137,7 +137,7 @@ namespace Jackett.Common.Indexers
         {
             var loginPage = await RequestStringWithCookies(LandingUrl);
             CQ dom = loginPage.Content;
-            CQ qCaptchaImg = dom.Find("img#regimage").First();
+            var qCaptchaImg = dom.Find("img#regimage").First();
             if (qCaptchaImg.Length > 0)
             {
                 var CaptchaUrl = qCaptchaImg.Attr("src");
diff --git a/src/Jackett.Common/Indexers/Xthor.cs b/src/Jackett.Common/Indexers/Xthor.cs
index 4c6e92e90..108de137e 100644
--- a/src/Jackett.Common/Indexers/Xthor.cs
+++ b/src/Jackett.Common/Indexers/Xthor.cs
@@ -184,7 +184,7 @@ namespace Jackett.Common.Indexers
 
             if (EnhancedAnime && query.HasSpecifiedCategories && (query.Categories.Contains(TorznabCatType.TVAnime.ID) || query.Categories.Contains(100032) || query.Categories.Contains(100101) || query.Categories.Contains(100110)))
             {
-                System.Text.RegularExpressions.Regex regex = new Regex(" ([0-9]+)");
+                var regex = new Regex(" ([0-9]+)");
                 searchTerm = regex.Replace(searchTerm, " E$1");
             }
 
@@ -226,7 +226,7 @@ namespace Jackett.Common.Indexers
                         //issue #3847 replace multi keyword
                         if (!string.IsNullOrEmpty(ReplaceMulti))
                         {
-                            System.Text.RegularExpressions.Regex regex = new Regex("(?i)([\\.\\- ])MULTI([\\.\\- ])");
+                            var regex = new Regex("(?i)([\\.\\- ])MULTI([\\.\\- ])");
                             torrent.name = regex.Replace(torrent.name, "$1" + ReplaceMulti + "$2");
                         }
 
@@ -388,9 +388,9 @@ namespace Jackett.Common.Indexers
         /// </summary>
         /// <param name="request">URL created by Query Builder</param>
         /// <returns>Results from query</returns>
-        private async Task<String> QueryExec(string request)
+        private async Task<string> QueryExec(string request)
         {
-            String results;
+            string results;
 
             // Switch in we are in DEV mode with Hard Drive Cache or not
             if (DevMode && CacheMode)
@@ -411,9 +411,9 @@ namespace Jackett.Common.Indexers
         /// </summary>
         /// <param name="request">URL created by Query Builder</param>
         /// <returns>Results from query</returns>
-        private async Task<String> QueryCache(string request)
+        private async Task<string> QueryCache(string request)
         {
-            String results;
+            string results;
 
             // Create Directory if not exist
             System.IO.Directory.CreateDirectory(Directory);
@@ -422,10 +422,10 @@ namespace Jackett.Common.Indexers
             CleanCacheStorage();
 
             // File Name
-            string fileName = StringUtil.HashSHA1(request) + ".json";
+            var fileName = StringUtil.HashSHA1(request) + ".json";
 
             // Create fingerprint for request
-            string file = Path.Combine(Directory, fileName);
+            var file = Path.Combine(Directory, fileName);
 
             // Checking modes states
             if (File.Exists(file))
@@ -434,10 +434,10 @@ namespace Jackett.Common.Indexers
                 Output("Loading results from hard drive cache ..." + fileName);
                 try
                 {
-                    using (StreamReader fileReader = File.OpenText(file))
+                    using (var fileReader = File.OpenText(file))
                     {
-                        JsonSerializer serializer = new JsonSerializer();
-                        results = (String)serializer.Deserialize(fileReader, typeof(String));
+                        var serializer = new JsonSerializer();
+                        results = (string)serializer.Deserialize(fileReader, typeof(string));
                     }
                 }
                 catch (Exception e)
@@ -453,9 +453,9 @@ namespace Jackett.Common.Indexers
 
                 // Cached file didn't exist for our query, writing it right now !
                 Output("Writing results to hard drive cache ..." + fileName);
-                using (StreamWriter fileWriter = File.CreateText(file))
+                using (var fileWriter = File.CreateText(file))
                 {
-                    JsonSerializer serializer = new JsonSerializer();
+                    var serializer = new JsonSerializer();
                     serializer.Serialize(fileWriter, results);
                 }
             }
@@ -467,7 +467,7 @@ namespace Jackett.Common.Indexers
         /// </summary>
         /// <param name="request">URL created by Query Builder</param>
         /// <returns>Results from query</returns>
-        private async Task<String> QueryTracker(string request)
+        private async Task<string> QueryTracker(string request)
         {
             // Cache mode not enabled or cached file didn't exist for our query
             Output("\nQuerying tracker for results....");
diff --git a/src/Jackett.Common/Indexers/digitalcore.cs b/src/Jackett.Common/Indexers/digitalcore.cs
index bf4e8cc72..be7eefea1 100644
--- a/src/Jackett.Common/Indexers/digitalcore.cs
+++ b/src/Jackett.Common/Indexers/digitalcore.cs
@@ -109,7 +109,7 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+            var releases = new List<ReleaseInfo>();
             var queryCollection = new NameValueCollection();
             var searchString = query.GetQueryString();
             var searchUrl = SearchUrl;
diff --git a/src/Jackett.Common/Indexers/myAmity.cs b/src/Jackett.Common/Indexers/myAmity.cs
index ef92e297e..f8bc9d56f 100644
--- a/src/Jackett.Common/Indexers/myAmity.cs
+++ b/src/Jackett.Common/Indexers/myAmity.cs
@@ -87,12 +87,12 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
-            TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
-            TimeSpan delta = new TimeSpan(1, 0, 0);
-            TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
+            var startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
+            var endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
+            var delta = new TimeSpan(1, 0, 0);
+            var adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
             TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
-            TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
+            var germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
 
             var releases = new List<ReleaseInfo>();
 
@@ -165,9 +165,9 @@ namespace Jackett.Common.Indexers
                     release.Peers = ParseUtil.CoerceInt(qLeechers.Text()) + release.Seeders;
 
                     var dateStr = qDateStr.Text().Trim();
-                    DateTime dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+                    var dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
 
-                    DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
+                    var pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
                     release.PublishDate = pubDateUtc.ToLocalTime();
 
                     var grabs = qRow.Find("td:nth-child(6)").Text();
diff --git a/src/Jackett.Common/Indexers/pornolab.cs b/src/Jackett.Common/Indexers/pornolab.cs
index 3894aa38f..ad6eaf503 100644
--- a/src/Jackett.Common/Indexers/pornolab.cs
+++ b/src/Jackett.Common/Indexers/pornolab.cs
@@ -250,7 +250,7 @@ namespace Jackett.Common.Indexers
             }
             try
             {
-                string RowsSelector = "table#tor-tbl > tbody > tr";
+                var RowsSelector = "table#tor-tbl > tbody > tr";
 
                 var SearchResultParser = new HtmlParser();
                 var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
@@ -322,7 +322,7 @@ namespace Jackett.Common.Indexers
         // referer link support
         public override async Task<byte[]> Download(Uri link)
         {
-            Uri downloadlink = link;
+            var downloadlink = link;
             var response = await RequestStringWithCookies(link.ToString());
             var results = response.Content;
             var SearchResultParser = new HtmlParser();
diff --git a/src/Jackett.Common/Indexers/rutracker.cs b/src/Jackett.Common/Indexers/rutracker.cs
index e4ed9174f..1d67c4505 100644
--- a/src/Jackett.Common/Indexers/rutracker.cs
+++ b/src/Jackett.Common/Indexers/rutracker.cs
@@ -1532,7 +1532,7 @@ namespace Jackett.Common.Indexers
             }
             try
             {
-                string RowsSelector = "table#tor-tbl > tbody > tr";
+                var RowsSelector = "table#tor-tbl > tbody > tr";
 
                 var SearchResultParser = new HtmlParser();
                 var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
diff --git a/src/Jackett.Common/Indexers/toloka.cs b/src/Jackett.Common/Indexers/toloka.cs
index d486e9470..64e8ede74 100644
--- a/src/Jackett.Common/Indexers/toloka.cs
+++ b/src/Jackett.Common/Indexers/toloka.cs
@@ -240,7 +240,7 @@ namespace Jackett.Common.Indexers
             }
             try
             {
-                string RowsSelector = "table.forumline > tbody > tr[class*=prow]";
+                var RowsSelector = "table.forumline > tbody > tr[class*=prow]";
 
                 var SearchResultParser = new HtmlParser();
                 var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
diff --git a/src/Jackett.Common/Indexers/yts.cs b/src/Jackett.Common/Indexers/yts.cs
index dd9e5ccb6..cad0f6e2a 100644
--- a/src/Jackett.Common/Indexers/yts.cs
+++ b/src/Jackett.Common/Indexers/yts.cs
@@ -27,7 +27,7 @@ namespace Jackett.Common.Indexers
 
         private new ConfigurationData configData
         {
-            get { return (ConfigurationData)base.configData; }
+            get { return base.configData; }
             set { base.configData = value; }
         }
 
@@ -108,14 +108,14 @@ namespace Jackett.Common.Indexers
 
                 var jsonContent = JObject.Parse(jsonContentStr);
 
-                string result = jsonContent.Value<string>("status");
+                var result = jsonContent.Value<string>("status");
                 if (result != "ok") // query was not successful
                 {
                     return releases.ToArray();
                 }
 
                 var data_items = jsonContent.Value<JToken>("data");
-                int movie_count = data_items.Value<int>("movie_count");
+                var movie_count = data_items.Value<int>("movie_count");
                 if (movie_count < 1) // no results found in query
                 {
                     return releases.ToArray();
@@ -151,7 +151,7 @@ namespace Jackett.Common.Indexers
                         release.Imdb = ParseUtil.GetImdbID(imdb);
 
                         // API does not provide magnet link, so, construct it
-                        string magnet_uri = "magnet:?xt=urn:btih:" + torrent_info.Value<string>("hash") +
+                        var magnet_uri = "magnet:?xt=urn:btih:" + torrent_info.Value<string>("hash") +
                         "&dn=" + movie_item.Value<string>("slug") +
                         "&tr=udp://open.demonii.com:1337/announce" +
                         "&tr=udp://tracker.openbittorrent.com:80" +
diff --git a/src/Jackett.Common/Models/CachedQueryResult.cs b/src/Jackett.Common/Models/CachedQueryResult.cs
index f559c0225..0bf5828c9 100644
--- a/src/Jackett.Common/Models/CachedQueryResult.cs
+++ b/src/Jackett.Common/Models/CachedQueryResult.cs
@@ -5,9 +5,9 @@ namespace Jackett.Common.Models
 {
     public class CachedQueryResult
     {
-        private List<ReleaseInfo> results;
-        private DateTime created;
-        private string query;
+        private readonly List<ReleaseInfo> results;
+        private readonly DateTime created;
+        private readonly string query;
 
         public CachedQueryResult(string query, List<ReleaseInfo> results)
         {
diff --git a/src/Jackett.Common/Models/CategoryMapping.cs b/src/Jackett.Common/Models/CategoryMapping.cs
index 5b48d0d10..318ca1f51 100644
--- a/src/Jackett.Common/Models/CategoryMapping.cs
+++ b/src/Jackett.Common/Models/CategoryMapping.cs
@@ -1,6 +1,6 @@
 namespace Jackett.Common.Models
 {
-    class CategoryMapping
+    internal class CategoryMapping
     {
         public CategoryMapping(string trackerCat, string trackerCatDesc, int newzCat)
         {
diff --git a/src/Jackett.Common/Models/Config/RuntimeSettings.cs b/src/Jackett.Common/Models/Config/RuntimeSettings.cs
index f662a5134..00e9dfd0f 100644
--- a/src/Jackett.Common/Models/Config/RuntimeSettings.cs
+++ b/src/Jackett.Common/Models/Config/RuntimeSettings.cs
@@ -32,9 +32,9 @@ namespace Jackett.Common.Models.Config
         {
             get
             {
-                if (!string.IsNullOrWhiteSpace(this.CustomDataFolder))
+                if (!string.IsNullOrWhiteSpace(CustomDataFolder))
                 {
-                    return this.CustomDataFolder;
+                    return CustomDataFolder;
                 }
 
                 if (System.Environment.OSVersion.Platform == PlatformID.Unix)
diff --git a/src/Jackett.Common/Models/Config/ServerConfig.cs b/src/Jackett.Common/Models/Config/ServerConfig.cs
index 8e0c022ac..55f727f58 100644
--- a/src/Jackett.Common/Models/Config/ServerConfig.cs
+++ b/src/Jackett.Common/Models/Config/ServerConfig.cs
@@ -120,20 +120,20 @@ namespace Jackett.Common.Models.Config
 
         private class UnSubscriber : IDisposable
         {
-            private List<IObserver<ServerConfig>> lstObservers;
-            private IObserver<ServerConfig> observer;
+            private readonly List<IObserver<ServerConfig>> lstObservers;
+            private readonly IObserver<ServerConfig> observer;
 
             public UnSubscriber(List<IObserver<ServerConfig>> ObserversCollection, IObserver<ServerConfig> observer)
             {
-                this.lstObservers = ObserversCollection;
+                lstObservers = ObserversCollection;
                 this.observer = observer;
             }
 
             public void Dispose()
             {
-                if (this.observer != null)
+                if (observer != null)
                 {
-                    lstObservers.Remove(this.observer);
+                    lstObservers.Remove(observer);
                 }
             }
         }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs
index 6de938b3d..9144993ef 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs
@@ -1,6 +1,6 @@
 namespace Jackett.Common.Models.IndexerConfig.Bespoke
 {
-    class ConfigurationDataAbnormal : ConfigurationData
+    internal class ConfigurationDataAbnormal : ConfigurationData
     {
         public HiddenItem AuthKey { get; set; }
         public HiddenItem TorrentPass { get; set; }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs
index b7750928a..0099fe182 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs
@@ -1,6 +1,6 @@
 namespace Jackett.Common.Models.IndexerConfig.Bespoke
 {
-    class ConfigurationDataAnimeBytes : ConfigurationDataUserPasskey
+    internal class ConfigurationDataAnimeBytes : ConfigurationDataUserPasskey
     {
         public BoolItem IncludeRaw { get; private set; }
         //public DisplayItem DateWarning { get; private set; }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataEliteTracker.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataEliteTracker.cs
index 6406c1b16..6b9533f62 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataEliteTracker.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataEliteTracker.cs
@@ -1,6 +1,6 @@
 namespace Jackett.Common.Models.IndexerConfig.Bespoke
 {
-    class ConfigurationDataEliteTracker : ConfigurationDataBasicLogin
+    internal class ConfigurationDataEliteTracker : ConfigurationDataBasicLogin
     {
         public BoolItem TorrentHTTPSMode { get; private set; }
         public DisplayItem PagesWarning { get; private set; }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs
index fc149fdef..fa14fa99b 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs
@@ -1,6 +1,6 @@
 namespace Jackett.Common.Models.IndexerConfig.Bespoke
 {
-    class ConfigurationDataFileList : ConfigurationDataBasicLogin
+    internal class ConfigurationDataFileList : ConfigurationDataBasicLogin
     {
         public BoolItem IncludeRomanianReleases { get; private set; }
         public DisplayItem CatWarning { get; private set; }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs
index 02b1018a2..361649673 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs
@@ -22,12 +22,12 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
 
         public ConfigurationDataNCore(JToken json)
         {
-            ConfigurationDataNCore configData = new ConfigurationDataNCore();
+            var configData = new ConfigurationDataNCore();
 
             dynamic configArray = JsonConvert.DeserializeObject(json.ToString());
             foreach (var config in configArray)
             {
-                string propertyName = UppercaseFirst((string)config.id);
+                var propertyName = UppercaseFirst((string)config.id);
                 switch (propertyName)
                 {
                     case "Username":
@@ -51,7 +51,7 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
             }
         }
 
-        static string UppercaseFirst(string s)
+        private static string UppercaseFirst(string s)
         {
             if (string.IsNullOrEmpty(s))
                 return string.Empty;
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataPornolab.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataPornolab.cs
index a934d2f01..68472d478 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataPornolab.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataPornolab.cs
@@ -1,6 +1,6 @@
 namespace Jackett.Common.Models.IndexerConfig.Bespoke
 {
-    class ConfigurationDataPornolab : ConfigurationDataCaptchaLogin
+    internal class ConfigurationDataPornolab : ConfigurationDataCaptchaLogin
     {
         public BoolItem StripRussianLetters { get; private set; }
 
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs
index 81ea35b1c..6a550b36f 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs
@@ -1,6 +1,6 @@
 namespace Jackett.Common.Models.IndexerConfig.Bespoke
 {
-    class ConfigurationDataRutracker : ConfigurationDataCaptchaLogin
+    internal class ConfigurationDataRutracker : ConfigurationDataCaptchaLogin
     {
         public BoolItem StripRussianLetters { get; private set; }
         public DisplayItem CaptchaWarning { get; private set; }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataTVstore.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataTVstore.cs
index d9c222f76..f0f9bf697 100755
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataTVstore.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataTVstore.cs
@@ -16,12 +16,12 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
 
         public ConfigurationDataTVstore(JToken json)
         {
-            ConfigurationDataTVstore configData = new ConfigurationDataTVstore();
+            var configData = new ConfigurationDataTVstore();
 
             dynamic configArray = JsonConvert.DeserializeObject(json.ToString());
             foreach (var config in configArray)
             {
-                string propertyName = UppercaseFirst((string)config.id);
+                var propertyName = UppercaseFirst((string)config.id);
                 switch (propertyName)
                 {
                     case "Username":
@@ -36,7 +36,7 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
             }
         }
 
-        static string UppercaseFirst(string s)
+        private static string UppercaseFirst(string s)
         {
             if (string.IsNullOrEmpty(s))
                 return string.Empty;
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataToloka.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataToloka.cs
index d9de625c4..7da0cfbd6 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataToloka.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataToloka.cs
@@ -1,6 +1,6 @@
 namespace Jackett.Common.Models.IndexerConfig.Bespoke
 {
-    class ConfigurationDataToloka : ConfigurationDataBasicLogin
+    internal class ConfigurationDataToloka : ConfigurationDataBasicLogin
     {
         public BoolItem StripCyrillicLetters { get; private set; }
 
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs
index d5b614b27..7c7750888 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs
@@ -1,6 +1,6 @@
 namespace Jackett.Common.Models.IndexerConfig.Bespoke
 {
-    class ConfigurationDataXthor : ConfigurationData
+    internal class ConfigurationDataXthor : ConfigurationData
     {
         public DisplayItem CredentialsWarning { get; private set; }
         public StringItem PassKey { get; set; }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs
index 8d6628eab..4cafff552 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs
@@ -9,7 +9,7 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationData
     {
-        const string PASSWORD_REPLACEMENT = "|||%%PREVJACKPASSWD%%|||";
+        private const string PASSWORD_REPLACEMENT = "|||%%PREVJACKPASSWD%%|||";
         protected Dictionary<string, Item> dynamics = new Dictionary<string, Item>(); // list for dynamic items
 
         public enum ItemType
@@ -140,7 +140,7 @@ namespace Jackett.Common.Models.IndexerConfig
                         }
                         break;
                     case ItemType.DisplayImage:
-                        string dataUri = DataUrlUtils.BytesToDataUrl(((ImageItem)item).Value, "image/jpeg");
+                        var dataUri = DataUrlUtils.BytesToDataUrl(((ImageItem)item).Value, "image/jpeg");
                         jObject["value"] = dataUri;
                         break;
                 }
@@ -149,9 +149,9 @@ namespace Jackett.Common.Models.IndexerConfig
             return jArray;
         }
 
-        Item[] GetItems(bool forDisplay)
+        private Item[] GetItems(bool forDisplay)
         {
-            List<Item> properties = GetType()
+            var properties = GetType()
                 .GetProperties()
                 .Where(p => p.CanRead)
                 .Where(p => p.PropertyType.IsSubclassOf(typeof(Item)))
@@ -237,7 +237,7 @@ namespace Jackett.Common.Models.IndexerConfig
             public string Challenge { get; set; }
             public RecaptchaItem()
             {
-                this.Version = "2";
+                Version = "2";
                 ItemType = ConfigurationData.ItemType.Recaptcha;
             }
         }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs
index e07ecf009..1f71840f5 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs
@@ -1,6 +1,6 @@
 namespace Jackett.Common.Models.IndexerConfig
 {
-    class ConfigurationDataCaptchaLogin : ConfigurationData
+    internal class ConfigurationDataCaptchaLogin : ConfigurationData
     {
         public StringItem Username { get; private set; }
 
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs
index 46b5907f1..1c0ef7cfb 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs
@@ -1,6 +1,6 @@
 namespace Jackett.Common.Models.IndexerConfig
 {
-    class ConfigurationDataPinNumber : ConfigurationDataBasicLogin
+    internal class ConfigurationDataPinNumber : ConfigurationDataBasicLogin
     {
         public StringItem Pin { get; private set; }
 
diff --git a/src/Jackett.Common/Models/ResultPage.cs b/src/Jackett.Common/Models/ResultPage.cs
index 398d7ae11..cc18b8da7 100644
--- a/src/Jackett.Common/Models/ResultPage.cs
+++ b/src/Jackett.Common/Models/ResultPage.cs
@@ -9,8 +9,8 @@ namespace Jackett.Common.Models
 {
     public class ResultPage
     {
-        static XNamespace atomNs = "http://www.w3.org/2005/Atom";
-        static XNamespace torznabNs = "http://torznab.com/schemas/2015/feed";
+        private static readonly XNamespace atomNs = "http://www.w3.org/2005/Atom";
+        private static readonly XNamespace torznabNs = "http://torznab.com/schemas/2015/feed";
 
         public ChannelInfo ChannelInfo { get; private set; }
         public IEnumerable<ReleaseInfo> Releases { get; set; }
@@ -21,7 +21,7 @@ namespace Jackett.Common.Models
             Releases = new List<ReleaseInfo>();
         }
 
-        string xmlDateFormat(DateTime dt)
+        private string xmlDateFormat(DateTime dt)
         {
             Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
             //Sat, 14 Mar 2015 17:10:42 -0400
@@ -29,7 +29,7 @@ namespace Jackett.Common.Models
             return f;
         }
 
-        XElement getTorznabElement(string name, object value)
+        private XElement getTorznabElement(string name, object value)
         {
             return value == null ? null : new XElement(torznabNs + "attr", new XAttribute("name", name), new XAttribute("value", value));
         }
diff --git a/src/Jackett.Common/Models/TorznabCapabilities.cs b/src/Jackett.Common/Models/TorznabCapabilities.cs
index 97c204b68..8d6d1ef46 100644
--- a/src/Jackett.Common/Models/TorznabCapabilities.cs
+++ b/src/Jackett.Common/Models/TorznabCapabilities.cs
@@ -59,7 +59,7 @@ namespace Jackett.Common.Models
             MovieSearchAvailable = Categories.Any(i => TorznabCatType.Movies.Contains(i));
         }
 
-        string SupportedTVSearchParams
+        private string SupportedTVSearchParams
         {
             get
             {
@@ -72,7 +72,7 @@ namespace Jackett.Common.Models
             }
         }
 
-        string SupportedMovieSearchParams
+        private string SupportedMovieSearchParams
         {
             get
             {
@@ -83,7 +83,7 @@ namespace Jackett.Common.Models
             }
         }
 
-        string SupportedMusicSearchParams
+        private string SupportedMusicSearchParams
         {
             get
             {
diff --git a/src/Jackett.Common/Models/TorznabCategory.cs b/src/Jackett.Common/Models/TorznabCategory.cs
index 6b6cf6d01..29bc460df 100644
--- a/src/Jackett.Common/Models/TorznabCategory.cs
+++ b/src/Jackett.Common/Models/TorznabCategory.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 
@@ -42,7 +41,7 @@ namespace Jackett.Common.Models
             return t;
         }
 
-        public override bool Equals(Object obj)
+        public override bool Equals(object obj)
         {
             if (obj == null || GetType() != obj.GetType())
                 return false;
diff --git a/src/Jackett.Common/Models/TorznabQuery.cs b/src/Jackett.Common/Models/TorznabQuery.cs
index bea9fad4b..98fe1f9c6 100644
--- a/src/Jackett.Common/Models/TorznabQuery.cs
+++ b/src/Jackett.Common/Models/TorznabQuery.cs
@@ -204,7 +204,7 @@ namespace Jackett.Common.Models
                         limit = queryString.Length;
                     queryString = queryString.Substring(0, (int)limit);
                 }
-                Regex SplitRegex = new Regex("[^a-zA-Z0-9]+");
+                var SplitRegex = new Regex("[^a-zA-Z0-9]+");
                 QueryStringParts = SplitRegex.Split(queryString);
             }
 
@@ -225,8 +225,7 @@ namespace Jackett.Common.Models
                 return string.Empty;
 
             string episodeString;
-            DateTime showDate;
-            if (DateTime.TryParseExact(string.Format("{0} {1}", Season, Episode), "yyyy MM/dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out showDate))
+            if (DateTime.TryParseExact(string.Format("{0} {1}", Season, Episode), "yyyy MM/dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out var showDate))
                 episodeString = showDate.ToString("yyyy.MM.dd");
             else if (string.IsNullOrEmpty(Episode))
                 episodeString = string.Format("S{0:00}", Season);
diff --git a/src/Jackett.Common/Models/TrackerCache.cs b/src/Jackett.Common/Models/TrackerCache.cs
index 1b53e59c0..03fcc90b1 100644
--- a/src/Jackett.Common/Models/TrackerCache.cs
+++ b/src/Jackett.Common/Models/TrackerCache.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 namespace Jackett.Common.Models
 {
-    class TrackerCache
+    internal class TrackerCache
     {
         public string TrackerId { set; get; }
         public string TrackerName { set; get; }
diff --git a/src/Jackett.Common/Plumbing/JackettModule.cs b/src/Jackett.Common/Plumbing/JackettModule.cs
index e83c41897..3ce7b6f71 100644
--- a/src/Jackett.Common/Plumbing/JackettModule.cs
+++ b/src/Jackett.Common/Plumbing/JackettModule.cs
@@ -12,7 +12,7 @@ namespace Jackett.Common.Plumbing
 {
     public class JackettModule : Autofac.Module
     {
-        private RuntimeSettings _runtimeSettings;
+        private readonly RuntimeSettings _runtimeSettings;
 
         public JackettModule(RuntimeSettings runtimeSettings)
         {
@@ -82,13 +82,13 @@ namespace Jackett.Common.Plumbing
 
         private static bool DetectMonoCompatabilityWithHttpClient()
         {
-            bool usehttpclient = false;
+            var usehttpclient = false;
             try
             {
-                Type monotype = Type.GetType("Mono.Runtime");
+                var monotype = Type.GetType("Mono.Runtime");
                 if (monotype != null)
                 {
-                    MethodInfo displayName = monotype.GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static);
+                    var displayName = monotype.GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static);
                     if (displayName != null)
                     {
                         var monoVersion = displayName.Invoke(null, null).ToString();
@@ -97,17 +97,17 @@ namespace Jackett.Common.Plumbing
                         {
                             // check if btls is supported
                             var monoSecurity = Assembly.Load("Mono.Security");
-                            Type monoTlsProviderFactory = monoSecurity.GetType("Mono.Security.Interface.MonoTlsProviderFactory");
+                            var monoTlsProviderFactory = monoSecurity.GetType("Mono.Security.Interface.MonoTlsProviderFactory");
                             if (monoTlsProviderFactory != null)
                             {
-                                MethodInfo isProviderSupported = monoTlsProviderFactory.GetMethod("IsProviderSupported");
+                                var isProviderSupported = monoTlsProviderFactory.GetMethod("IsProviderSupported");
                                 if (isProviderSupported != null)
                                 {
                                     var btlsSupported = (bool)isProviderSupported.Invoke(null, new string[] { "btls" });
                                     if (btlsSupported)
                                     {
                                         // initialize btls
-                                        MethodInfo initialize = monoTlsProviderFactory.GetMethod("Initialize", new[] { typeof(string) });
+                                        var initialize = monoTlsProviderFactory.GetMethod("Initialize", new[] { typeof(string) });
                                         if (initialize != null)
                                         {
                                             initialize.Invoke(null, new string[] { "btls" });
diff --git a/src/Jackett.Common/Services/CacheService.cs b/src/Jackett.Common/Services/CacheService.cs
index 0db8d8099..d21e67371 100644
--- a/src/Jackett.Common/Services/CacheService.cs
+++ b/src/Jackett.Common/Services/CacheService.cs
@@ -53,7 +53,7 @@ namespace Jackett.Common.Services
         {
             lock (cache)
             {
-                int newItemCount = 0;
+                var newItemCount = 0;
                 var trackerCache = cache.Where(c => c.TrackerId == indexer.ID).FirstOrDefault();
                 if (trackerCache != null)
                 {
diff --git a/src/Jackett.Common/Services/ConfigurationService.cs b/src/Jackett.Common/Services/ConfigurationService.cs
index 00bea3263..eb0426663 100644
--- a/src/Jackett.Common/Services/ConfigurationService.cs
+++ b/src/Jackett.Common/Services/ConfigurationService.cs
@@ -15,10 +15,10 @@ namespace Jackett.Common.Services
 
     public class ConfigurationService : IConfigurationService
     {
-        private ISerializeService serializeService;
-        private Logger logger;
-        private IProcessService processService;
-        private RuntimeSettings runtimeSettings;
+        private readonly ISerializeService serializeService;
+        private readonly Logger logger;
+        private readonly IProcessService processService;
+        private readonly RuntimeSettings runtimeSettings;
 
         public ConfigurationService(ISerializeService s, IProcessService p, Logger l, RuntimeSettings settings)
         {
@@ -59,7 +59,7 @@ namespace Jackett.Common.Services
             {
                 try
                 {
-                    string oldDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Jackett");
+                    var oldDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Jackett");
                     if (Directory.Exists(oldDir))
                     {
 
@@ -175,7 +175,7 @@ namespace Jackett.Common.Services
         public string GetContentFolder()
         {
             // If we are debugging we can use the non copied content.
-            string dir = Path.Combine(ApplicationFolder(), "Content");
+            var dir = Path.Combine(ApplicationFolder(), "Content");
             ;
 
 #if DEBUG
@@ -191,7 +191,7 @@ namespace Jackett.Common.Services
 
         public List<string> GetCardigannDefinitionsFolders()
         {
-            List<string> dirs = new List<string>();
+            var dirs = new List<string>();
 
             if (System.Environment.OSVersion.Platform == PlatformID.Unix)
             {
@@ -205,7 +205,7 @@ namespace Jackett.Common.Services
             }
 
             // If we are debugging we can use the non copied definitions.
-            string dir = Path.Combine(ApplicationFolder(), "Definitions");
+            var dir = Path.Combine(ApplicationFolder(), "Definitions");
             ;
 
 #if DEBUG
diff --git a/src/Jackett.Common/Services/ImdbResolver.cs b/src/Jackett.Common/Services/ImdbResolver.cs
index a81458347..90d6a1eee 100644
--- a/src/Jackett.Common/Services/ImdbResolver.cs
+++ b/src/Jackett.Common/Services/ImdbResolver.cs
@@ -42,8 +42,8 @@ namespace Jackett.Common.Services
             return movie;
         }
 
-        private WebClient WebClient;
-        private string apiKey;
+        private readonly WebClient WebClient;
+        private readonly string apiKey;
         private string url;
     }
 }
diff --git a/src/Jackett.Common/Services/IndexerConfigurationService.cs b/src/Jackett.Common/Services/IndexerConfigurationService.cs
index 992951b10..4dd2f193d 100644
--- a/src/Jackett.Common/Services/IndexerConfigurationService.cs
+++ b/src/Jackett.Common/Services/IndexerConfigurationService.cs
@@ -146,8 +146,8 @@ namespace Jackett.Common.Services
             return Path.Combine(configService.GetIndexerConfigDir(), indexer.ID + ".json");
         }
 
-        private IConfigurationService configService;
-        private Logger logger;
+        private readonly IConfigurationService configService;
+        private readonly Logger logger;
 
         private static readonly object configWriteLock = new object();
     }
diff --git a/src/Jackett.Common/Services/IndexerManagerService.cs b/src/Jackett.Common/Services/IndexerManagerService.cs
index 501d56135..5eb5790bf 100644
--- a/src/Jackett.Common/Services/IndexerManagerService.cs
+++ b/src/Jackett.Common/Services/IndexerManagerService.cs
@@ -19,16 +19,16 @@ namespace Jackett.Common.Services
 
     public class IndexerManagerService : IIndexerManagerService
     {
-        private ICacheService cacheService;
-        private IIndexerConfigurationService configService;
-        private IProtectionService protectionService;
-        private WebClient webClient;
-        private IProcessService processService;
-        private IConfigurationService globalConfigService;
-        private ServerConfig serverConfig;
-        private Logger logger;
+        private readonly ICacheService cacheService;
+        private readonly IIndexerConfigurationService configService;
+        private readonly IProtectionService protectionService;
+        private readonly WebClient webClient;
+        private readonly IProcessService processService;
+        private readonly IConfigurationService globalConfigService;
+        private readonly ServerConfig serverConfig;
+        private readonly Logger logger;
 
-        private Dictionary<string, IIndexer> indexers = new Dictionary<string, IIndexer>();
+        private readonly Dictionary<string, IIndexer> indexers = new Dictionary<string, IIndexer>();
         private AggregateIndexer aggregateIndexer;
 
         public IndexerManagerService(IIndexerConfigurationService config, IProtectionService protectionService, WebClient webClient, Logger l, ICacheService cache, IProcessService processService, IConfigurationService globalConfigService, ServerConfig serverConfig)
@@ -108,7 +108,7 @@ namespace Jackett.Common.Services
 
                     try
                     {
-                        string DefinitionString = File.ReadAllText(file.FullName);
+                        var DefinitionString = File.ReadAllText(file.FullName);
                         var definition = deserializer.Deserialize<IndexerDefinition>(DefinitionString);
                         return definition;
                     }
@@ -119,7 +119,7 @@ namespace Jackett.Common.Services
                     }
                 }).Where(definition => definition != null);
 
-                List<IIndexer> cardigannIndexers = definitions.Select(definition =>
+                var cardigannIndexers = definitions.Select(definition =>
                 {
                     try
                     {
diff --git a/src/Jackett.Common/Services/ProcessService.cs b/src/Jackett.Common/Services/ProcessService.cs
index 382d90d22..c1ef52a25 100644
--- a/src/Jackett.Common/Services/ProcessService.cs
+++ b/src/Jackett.Common/Services/ProcessService.cs
@@ -8,7 +8,7 @@ namespace Jackett.Common.Services
 
     public class ProcessService : IProcessService
     {
-        private Logger logger;
+        private readonly Logger logger;
 
         public ProcessService(Logger l)
         {
diff --git a/src/Jackett.Common/Services/SpinService.cs b/src/Jackett.Common/Services/SpinService.cs
index b303b6965..cabeccd7b 100644
--- a/src/Jackett.Common/Services/SpinService.cs
+++ b/src/Jackett.Common/Services/SpinService.cs
@@ -3,10 +3,9 @@ using Jackett.Common.Services.Interfaces;
 
 namespace Jackett.Common.Services
 {
-
-    class RunTimeService : IRunTimeService
+    internal class RunTimeService : IRunTimeService
     {
-        private bool isRunning = true;
+        private readonly bool isRunning = true;
 
         public void Spin()
         {
diff --git a/src/Jackett.Common/Services/UpdateService.cs b/src/Jackett.Common/Services/UpdateService.cs
index 601777e6b..258ffa907 100644
--- a/src/Jackett.Common/Services/UpdateService.cs
+++ b/src/Jackett.Common/Services/UpdateService.cs
@@ -25,17 +25,17 @@ namespace Jackett.Common.Services
 
     public class UpdateService : IUpdateService
     {
-        Logger logger;
-        WebClient client;
-        IConfigurationService configService;
-        ManualResetEvent locker = new ManualResetEvent(false);
-        ITrayLockService lockService;
-        IProcessService processService;
-        IServiceConfigService windowsService;
-        IFilePermissionService filePermissionService;
-        private ServerConfig serverConfig;
-        bool forceupdatecheck = false;
-        Variants.JackettVariant variant = Variants.JackettVariant.NotFound;
+        private readonly Logger logger;
+        private readonly WebClient client;
+        private readonly IConfigurationService configService;
+        private readonly ManualResetEvent locker = new ManualResetEvent(false);
+        private readonly ITrayLockService lockService;
+        private readonly IProcessService processService;
+        private readonly IServiceConfigService windowsService;
+        private readonly IFilePermissionService filePermissionService;
+        private readonly ServerConfig serverConfig;
+        private bool forceupdatecheck = false;
+        private Variants.JackettVariant variant = Variants.JackettVariant.NotFound;
 
         public UpdateService(Logger l, WebClient c, IConfigurationService cfg, ITrayLockService ls, IProcessService ps, IServiceConfigService ws, IFilePermissionService fps, ServerConfig sc)
         {
@@ -99,7 +99,7 @@ namespace Jackett.Common.Services
                 return;
             }
 
-            Variants variants = new Variants();
+            var variants = new Variants();
             variant = variants.GetVariant();
             logger.Info("Jackett variant: " + variant.ToString());
 
@@ -112,7 +112,7 @@ namespace Jackett.Common.Services
                 return;
             }
 
-            bool trayIsRunning = false;
+            var trayIsRunning = false;
             if (isWindows)
             {
                 trayIsRunning = Process.GetProcessesByName("JackettTray").Length > 0;
@@ -225,7 +225,7 @@ namespace Jackett.Common.Services
 
             try
             {
-                DirectoryInfo d = new DirectoryInfo(tempDir);
+                var d = new DirectoryInfo(tempDir);
                 foreach (var dir in d.GetDirectories("JackettUpdate-*"))
                 {
                     try
@@ -249,9 +249,9 @@ namespace Jackett.Common.Services
 
         private async Task<string> DownloadRelease(List<Asset> assets, bool isWindows, string version)
         {
-            Variants variants = new Variants();
-            string artifactFileName = variants.GetArtifactFileName(variant);
-            Asset targetAsset = assets.Where(a => a.Browser_download_url.EndsWith(artifactFileName, StringComparison.OrdinalIgnoreCase) && artifactFileName.Length > 0).FirstOrDefault();
+            var variants = new Variants();
+            var artifactFileName = variants.GetArtifactFileName(variant);
+            var targetAsset = assets.Where(a => a.Browser_download_url.EndsWith(artifactFileName, StringComparison.OrdinalIgnoreCase) && artifactFileName.Length > 0).FirstOrDefault();
 
             if (targetAsset == null)
             {
@@ -291,7 +291,7 @@ namespace Jackett.Common.Services
                 Stream inStream = File.OpenRead(gzPath);
                 Stream gzipStream = new GZipInputStream(inStream);
 
-                TarArchive tarArchive = TarArchive.CreateInputTarArchive(gzipStream);
+                var tarArchive = TarArchive.CreateInputTarArchive(gzipStream);
                 tarArchive.ExtractContents(tempDir);
                 tarArchive.Close();
                 gzipStream.Close();
@@ -306,28 +306,28 @@ namespace Jackett.Common.Services
 
                     // When the files get extracted, the execute permission for jackett and JackettUpdater don't get carried across
 
-                    string jackettPath = tempDir + "/Jackett/jackett";
+                    var jackettPath = tempDir + "/Jackett/jackett";
                     filePermissionService.MakeFileExecutable(jackettPath);
 
-                    string jackettUpdaterPath = tempDir + "/Jackett/JackettUpdater";
+                    var jackettUpdaterPath = tempDir + "/Jackett/JackettUpdater";
                     filePermissionService.MakeFileExecutable(jackettUpdaterPath);
 
                     if (variant == Variants.JackettVariant.CoreMacOs)
                     {
-                        string macosServicePath = tempDir + "/Jackett/install_service_macos";
+                        var macosServicePath = tempDir + "/Jackett/install_service_macos";
                         filePermissionService.MakeFileExecutable(macosServicePath);
                     }
                     else if (variant == Variants.JackettVariant.Mono)
                     {
-                        string systemdPath = tempDir + "/Jackett/install_service_systemd_mono.sh";
+                        var systemdPath = tempDir + "/Jackett/install_service_systemd_mono.sh";
                         filePermissionService.MakeFileExecutable(systemdPath);
                     }
                     else
                     {
-                        string systemdPath = tempDir + "/Jackett/install_service_systemd.sh";
+                        var systemdPath = tempDir + "/Jackett/install_service_systemd.sh";
                         filePermissionService.MakeFileExecutable(systemdPath);
 
-                        string launcherPath = tempDir + "/Jackett/jackett_launcher.sh";
+                        var launcherPath = tempDir + "/Jackett/jackett_launcher.sh";
                         filePermissionService.MakeFileExecutable(launcherPath);
                     }
                 }
@@ -338,7 +338,7 @@ namespace Jackett.Common.Services
 
         private void StartUpdate(string updaterExePath, string installLocation, bool isWindows, bool NoRestart, bool trayIsRunning)
         {
-            string appType = "Console";
+            var appType = "Console";
 
             if (isWindows && windowsService.ServiceExists() && windowsService.ServiceRunning())
             {
diff --git a/src/Jackett.Common/Services/WindowsServiceConfigService.cs b/src/Jackett.Common/Services/WindowsServiceConfigService.cs
index 02f791954..dc591e256 100644
--- a/src/Jackett.Common/Services/WindowsServiceConfigService.cs
+++ b/src/Jackett.Common/Services/WindowsServiceConfigService.cs
@@ -15,8 +15,8 @@ namespace Jackett.Common.Services
         private const string DESCRIPTION = "API Support for your favorite torrent trackers";
         private const string SERVICEEXE = "JackettService.exe";
 
-        private IProcessService processService;
-        private Logger logger;
+        private readonly IProcessService processService;
+        private readonly Logger logger;
 
         public WindowsServiceConfigService(IProcessService p, Logger l)
         {
@@ -51,7 +51,7 @@ namespace Jackett.Common.Services
 
         public ServiceController GetService(string serviceName)
         {
-            return ServiceController.GetServices().FirstOrDefault(c => String.Equals(c.ServiceName, serviceName, StringComparison.InvariantCultureIgnoreCase));
+            return ServiceController.GetServices().FirstOrDefault(c => string.Equals(c.ServiceName, serviceName, StringComparison.InvariantCultureIgnoreCase));
         }
 
         public void Install()
@@ -62,7 +62,7 @@ namespace Jackett.Common.Services
             }
             else
             {
-                string applicationFolder = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
+                var applicationFolder = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
 
                 var exePath = Path.Combine(applicationFolder, SERVICEEXE);
                 if (!File.Exists(exePath) && Debugger.IsAttached)
@@ -70,7 +70,7 @@ namespace Jackett.Common.Services
                     exePath = Path.Combine(applicationFolder, "..\\..\\..\\Jackett.Service\\bin\\Debug", SERVICEEXE);
                 }
 
-                string arg = $"create {NAME} start= auto binpath= \"{exePath}\" DisplayName= {NAME}";
+                var arg = $"create {NAME} start= auto binpath= \"{exePath}\" DisplayName= {NAME}";
 
                 processService.StartProcessAndLog("sc.exe", arg, true);
 
diff --git a/src/Jackett.Common/Utils/BrowserUtil.cs b/src/Jackett.Common/Utils/BrowserUtil.cs
index c7ac964ef..3f6d5e81f 100644
--- a/src/Jackett.Common/Utils/BrowserUtil.cs
+++ b/src/Jackett.Common/Utils/BrowserUtil.cs
@@ -25,7 +25,7 @@ namespace Jackett.Common.Utils
         public static string DecodeCloudFlareProtectedEmail(string input)
         {
             var key = Convert.ToInt32(input.Substring(0, 2), 16);
-            string result = "";
+            var result = "";
             for (var i = 2; i < input.Length - 1; i += 2)
             {
                 var hexChar = input.Substring(i, 2);
@@ -39,13 +39,13 @@ namespace Jackett.Common.Utils
         // decode cloudflare protected emails in a HTML document
         public static string DecodeCloudFlareProtectedEmailFromHTML(string html)
         {
-            Regex CFEMailRegex = new Regex("<span class=\"__cf_email__\" data-cfemail=\"(\\w+)\">\\[email&#160;protected\\]<\\/span><script data-cfhash='[\\w]+' type=\"text\\/javascript\">.*?<\\/script>", RegexOptions.Compiled);
+            var CFEMailRegex = new Regex("<span class=\"__cf_email__\" data-cfemail=\"(\\w+)\">\\[email&#160;protected\\]<\\/span><script data-cfhash='[\\w]+' type=\"text\\/javascript\">.*?<\\/script>", RegexOptions.Compiled);
             var CFEMailRegexMatches = CFEMailRegex.Match(html);
 
             while (CFEMailRegexMatches.Success)
             {
-                string all = CFEMailRegexMatches.Groups[0].Value;
-                string cfemail = CFEMailRegexMatches.Groups[1].Value;
+                var all = CFEMailRegexMatches.Groups[0].Value;
+                var cfemail = CFEMailRegexMatches.Groups[1].Value;
                 var decoded = DecodeCloudFlareProtectedEmail(cfemail);
                 html = html.Replace(all, decoded);
                 CFEMailRegexMatches = CFEMailRegexMatches.NextMatch();
diff --git a/src/Jackett.Common/Utils/BuildDate.cs b/src/Jackett.Common/Utils/BuildDate.cs
index a7b3d3239..9de9f025f 100644
--- a/src/Jackett.Common/Utils/BuildDate.cs
+++ b/src/Jackett.Common/Utils/BuildDate.cs
@@ -8,7 +8,7 @@ namespace Jackett.Common.Utils
     {
         public static DateTime GetBuildDateTime()
         {
-            Assembly commonAssembly = Assembly.GetExecutingAssembly();
+            var commonAssembly = Assembly.GetExecutingAssembly();
             var attribute = commonAssembly.GetCustomAttribute<BuildDateAttribute>();
             return attribute?.DateTime ?? default(DateTime);
         }
diff --git a/src/Jackett.Common/Utils/Clients/HttpWebClient.cs b/src/Jackett.Common/Utils/Clients/HttpWebClient.cs
index 9c71ba743..c016e5332 100644
--- a/src/Jackett.Common/Utils/Clients/HttpWebClient.cs
+++ b/src/Jackett.Common/Utils/Clients/HttpWebClient.cs
@@ -20,12 +20,12 @@ namespace Jackett.Common.Utils.Clients
 {
     public class HttpWebClient : WebClient
     {
-        static protected Dictionary<string, ICollection<string>> trustedCertificates = new Dictionary<string, ICollection<string>>();
-        static protected string webProxyUrl;
-        static protected IWebProxy webProxy;
+        protected static Dictionary<string, ICollection<string>> trustedCertificates = new Dictionary<string, ICollection<string>>();
+        protected static string webProxyUrl;
+        protected static IWebProxy webProxy;
 
         [DebuggerNonUserCode] // avoid "Exception User-Unhandled" Visual Studio messages
-        static public bool ValidateCertificate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+        public static bool ValidateCertificate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
         {
             if (sender.GetType() != typeof(HttpWebRequest))
                 return sslPolicyErrors == SslPolicyErrors.None;
@@ -33,9 +33,8 @@ namespace Jackett.Common.Utils.Clients
             var request = (HttpWebRequest)sender;
             var hash = certificate.GetCertHashString();
 
-            ICollection<string> hosts;
 
-            trustedCertificates.TryGetValue(hash, out hosts);
+            trustedCertificates.TryGetValue(hash, out var hosts);
             if (hosts != null)
             {
                 if (hosts.Contains(request.Host))
@@ -52,7 +51,7 @@ namespace Jackett.Common.Utils.Clients
             return sslPolicyErrors == SslPolicyErrors.None;
         }
 
-        static public void InitProxy(ServerConfig serverConfig)
+        public static void InitProxy(ServerConfig serverConfig)
         {
             // dispose old SocksWebProxy
             if (webProxy != null && webProxy is SocksWebProxy)
@@ -118,7 +117,7 @@ namespace Jackett.Common.Utils.Clients
                 InitProxy(serverConfig);
         }
 
-        override public void Init()
+        public override void Init()
         {
             ServicePointManager.DefaultConnectionLimit = 1000;
 
@@ -132,7 +131,7 @@ namespace Jackett.Common.Utils.Clients
             ServicePointManager.ServerCertificateValidationCallback += ValidateCertificate;
         }
 
-        override protected async Task<WebClientByteResult> Run(WebRequest webRequest)
+        protected override async Task<WebClientByteResult> Run(WebRequest webRequest)
         {
             ServicePointManager.SecurityProtocol = (SecurityProtocolType)192 | (SecurityProtocolType)768 | (SecurityProtocolType)3072;
 
@@ -154,12 +153,12 @@ namespace Jackett.Common.Utils.Clients
                 }
             }
 
-            string userAgent = webRequest.EmulateBrowser.Value ? BrowserUtil.ChromeUserAgent : "Jackett/" + configService.GetVersion();
+            var userAgent = webRequest.EmulateBrowser.Value ? BrowserUtil.ChromeUserAgent : "Jackett/" + configService.GetVersion();
 
-            using (ClearanceHandler clearanceHandlr = new ClearanceHandler(userAgent))
+            using (var clearanceHandlr = new ClearanceHandler(userAgent))
             {
                 clearanceHandlr.MaxTries = 30;
-                using (HttpClientHandler clientHandlr = new HttpClientHandler
+                using (var clientHandlr = new HttpClientHandler
                 {
                     CookieContainer = cookies,
                     AllowAutoRedirect = false, // Do not use this - Bugs ahoy! Lost cookies and more.
@@ -231,7 +230,7 @@ namespace Jackett.Common.Utils.Clients
 
                                 foreach (var header in response.Headers)
                                 {
-                                    IEnumerable<string> value = header.Value;
+                                    var value = header.Value;
                                     result.Headers[header.Key.ToLowerInvariant()] = value.ToArray();
                                 }
 
@@ -257,7 +256,7 @@ namespace Jackett.Common.Utils.Clients
                                                 // of this cloudflare approach..don't want to alter BaseWebResult.IsRedirect because normally
                                                 // it shoudln't include service unavailable..only if we have this redirect header.
                                                 response.StatusCode = System.Net.HttpStatusCode.Redirect;
-                                                redirtime = Int32.Parse(value.Substring(0, end));
+                                                redirtime = int.Parse(value.Substring(0, end));
                                                 System.Threading.Thread.Sleep(redirtime * 1000);
                                             }
                                         }
@@ -287,10 +286,9 @@ namespace Jackett.Common.Utils.Clients
                                 // Compatiblity issue between the cookie format and httpclient
                                 // Pull it out manually ignoring the expiry date then set it manually
                                 // http://stackoverflow.com/questions/14681144/httpclient-not-storing-cookies-in-cookiecontainer
-                                IEnumerable<string> cookieHeaders;
                                 var responseCookies = new List<Tuple<string, string>>();
 
-                                if (response.Headers.TryGetValues("set-cookie", out cookieHeaders))
+                                if (response.Headers.TryGetValues("set-cookie", out var cookieHeaders))
                                 {
                                     foreach (var value in cookieHeaders)
                                     {
@@ -317,11 +315,10 @@ namespace Jackett.Common.Utils.Clients
             }
         }
 
-        override public void AddTrustedCertificate(string host, string hash)
+        public override void AddTrustedCertificate(string host, string hash)
         {
             hash = hash.ToUpper();
-            ICollection<string> hosts;
-            trustedCertificates.TryGetValue(hash.ToUpper(), out hosts);
+            trustedCertificates.TryGetValue(hash.ToUpper(), out var hosts);
             if (hosts == null)
             {
                 hosts = new HashSet<string>();
diff --git a/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs b/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs
index 4c84382a5..19bfd7b43 100644
--- a/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs
+++ b/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs
@@ -22,17 +22,17 @@ namespace Jackett.Common.Utils.Clients
     // This should improve performance and avoid problems with too man open file handles.
     public class HttpWebClient2 : WebClient
     {
-        CookieContainer cookies;
-        ClearanceHandler clearanceHandlr;
-        HttpClientHandler clientHandlr;
-        HttpClient client;
+        private readonly CookieContainer cookies;
+        private ClearanceHandler clearanceHandlr;
+        private HttpClientHandler clientHandlr;
+        private HttpClient client;
 
-        static protected Dictionary<string, ICollection<string>> trustedCertificates = new Dictionary<string, ICollection<string>>();
-        static protected string webProxyUrl;
-        static protected IWebProxy webProxy;
+        protected static Dictionary<string, ICollection<string>> trustedCertificates = new Dictionary<string, ICollection<string>>();
+        protected static string webProxyUrl;
+        protected static IWebProxy webProxy;
 
         [DebuggerNonUserCode] // avoid "Exception User-Unhandled" Visual Studio messages
-        static public bool ValidateCertificate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+        public static bool ValidateCertificate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
         {
             if (sender.GetType() != typeof(HttpWebRequest))
                 return sslPolicyErrors == SslPolicyErrors.None;
@@ -40,9 +40,8 @@ namespace Jackett.Common.Utils.Clients
             var request = (HttpWebRequest)sender;
             var hash = certificate.GetCertHashString();
 
-            ICollection<string> hosts;
 
-            trustedCertificates.TryGetValue(hash, out hosts);
+            trustedCertificates.TryGetValue(hash, out var hosts);
             if (hosts != null)
             {
                 if (hosts.Contains(request.Host))
@@ -59,7 +58,7 @@ namespace Jackett.Common.Utils.Clients
             return sslPolicyErrors == SslPolicyErrors.None;
         }
 
-        static public void InitProxy(ServerConfig serverConfig)
+        public static void InitProxy(ServerConfig serverConfig)
         {
             // dispose old SocksWebProxy
             if (webProxy != null && webProxy is SocksWebProxy)
@@ -152,7 +151,7 @@ namespace Jackett.Common.Utils.Clients
             }
         }
 
-        override public void Init()
+        public override void Init()
         {
             if (serverConfig.RuntimeSettings.IgnoreSslErrors == true)
             {
@@ -166,7 +165,7 @@ namespace Jackett.Common.Utils.Clients
             ServicePointManager.ServerCertificateValidationCallback += ValidateCertificate;
         }
 
-        override protected async Task<WebClientByteResult> Run(WebRequest webRequest)
+        protected override async Task<WebClientByteResult> Run(WebRequest webRequest)
         {
             HttpResponseMessage response = null;
             var request = new HttpRequestMessage();
@@ -249,7 +248,7 @@ namespace Jackett.Common.Utils.Clients
 
             foreach (var header in response.Headers)
             {
-                IEnumerable<string> value = header.Value;
+                var value = header.Value;
                 result.Headers[header.Key.ToLowerInvariant()] = value.ToArray();
             }
 
@@ -275,7 +274,7 @@ namespace Jackett.Common.Utils.Clients
                             // of this cloudflare approach..don't want to alter BaseWebResult.IsRedirect because normally
                             // it shoudln't include service unavailable..only if we have this redirect header.
                             response.StatusCode = System.Net.HttpStatusCode.Redirect;
-                            redirtime = Int32.Parse(value.Substring(0, end));
+                            redirtime = int.Parse(value.Substring(0, end));
                             System.Threading.Thread.Sleep(redirtime * 1000);
                         }
                     }
@@ -305,10 +304,9 @@ namespace Jackett.Common.Utils.Clients
             // Compatiblity issue between the cookie format and httpclient
             // Pull it out manually ignoring the expiry date then set it manually
             // http://stackoverflow.com/questions/14681144/httpclient-not-storing-cookies-in-cookiecontainer
-            IEnumerable<string> cookieHeaders;
             var responseCookies = new List<Tuple<string, string>>();
 
-            if (response.Headers.TryGetValues("set-cookie", out cookieHeaders))
+            if (response.Headers.TryGetValues("set-cookie", out var cookieHeaders))
             {
                 foreach (var value in cookieHeaders)
                 {
@@ -331,11 +329,10 @@ namespace Jackett.Common.Utils.Clients
             return result;
         }
 
-        override public void AddTrustedCertificate(string host, string hash)
+        public override void AddTrustedCertificate(string host, string hash)
         {
             hash = hash.ToUpper();
-            ICollection<string> hosts;
-            trustedCertificates.TryGetValue(hash.ToUpper(), out hosts);
+            trustedCertificates.TryGetValue(hash.ToUpper(), out var hosts);
             if (hosts == null)
             {
                 hosts = new HashSet<string>();
diff --git a/src/Jackett.Common/Utils/Clients/HttpWebClient2NetCore.cs b/src/Jackett.Common/Utils/Clients/HttpWebClient2NetCore.cs
index d2908fc6f..11849b4d6 100644
--- a/src/Jackett.Common/Utils/Clients/HttpWebClient2NetCore.cs
+++ b/src/Jackett.Common/Utils/Clients/HttpWebClient2NetCore.cs
@@ -22,23 +22,22 @@ namespace Jackett.Common.Utils.Clients
     // This should improve performance and avoid problems with too many open file handles.
     public class HttpWebClient2NetCore : WebClient
     {
-        CookieContainer cookies;
-        ClearanceHandler clearanceHandlr;
-        HttpClientHandler clientHandlr;
-        HttpClient client;
+        private readonly CookieContainer cookies;
+        private ClearanceHandler clearanceHandlr;
+        private HttpClientHandler clientHandlr;
+        private HttpClient client;
 
-        static protected Dictionary<string, ICollection<string>> trustedCertificates = new Dictionary<string, ICollection<string>>();
-        static protected string webProxyUrl;
-        static protected IWebProxy webProxy;
+        protected static Dictionary<string, ICollection<string>> trustedCertificates = new Dictionary<string, ICollection<string>>();
+        protected static string webProxyUrl;
+        protected static IWebProxy webProxy;
 
         [DebuggerNonUserCode] // avoid "Exception User-Unhandled" Visual Studio messages
-        static public bool ValidateCertificate(HttpRequestMessage request, X509Certificate2 certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+        public static bool ValidateCertificate(HttpRequestMessage request, X509Certificate2 certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
         {
             var hash = certificate.GetCertHashString();
 
-            ICollection<string> hosts;
 
-            trustedCertificates.TryGetValue(hash, out hosts);
+            trustedCertificates.TryGetValue(hash, out var hosts);
             if (hosts != null)
             {
                 if (hosts.Contains(request.RequestUri.Host))
@@ -55,7 +54,7 @@ namespace Jackett.Common.Utils.Clients
             return sslPolicyErrors == SslPolicyErrors.None;
         }
 
-        static public void InitProxy(ServerConfig serverConfig)
+        public static void InitProxy(ServerConfig serverConfig)
         {
             // dispose old SocksWebProxy
             if (webProxy != null && webProxy is SocksWebProxy)
@@ -151,7 +150,7 @@ namespace Jackett.Common.Utils.Clients
             }
         }
 
-        override public void Init()
+        public override void Init()
         {
             ServicePointManager.DefaultConnectionLimit = 1000;
 
@@ -162,7 +161,7 @@ namespace Jackett.Common.Utils.Clients
             }
         }
 
-        override protected async Task<WebClientByteResult> Run(WebRequest webRequest)
+        protected override async Task<WebClientByteResult> Run(WebRequest webRequest)
         {
             HttpResponseMessage response = null;
             var request = new HttpRequestMessage();
@@ -245,7 +244,7 @@ namespace Jackett.Common.Utils.Clients
 
             foreach (var header in response.Headers)
             {
-                IEnumerable<string> value = header.Value;
+                var value = header.Value;
                 result.Headers[header.Key.ToLowerInvariant()] = value.ToArray();
             }
 
@@ -271,7 +270,7 @@ namespace Jackett.Common.Utils.Clients
                             // of this cloudflare approach..don't want to alter BaseWebResult.IsRedirect because normally
                             // it shoudln't include service unavailable..only if we have this redirect header.
                             response.StatusCode = System.Net.HttpStatusCode.Redirect;
-                            redirtime = Int32.Parse(value.Substring(0, end));
+                            redirtime = int.Parse(value.Substring(0, end));
                             System.Threading.Thread.Sleep(redirtime * 1000);
                         }
                     }
@@ -301,10 +300,9 @@ namespace Jackett.Common.Utils.Clients
             // Compatiblity issue between the cookie format and httpclient
             // Pull it out manually ignoring the expiry date then set it manually
             // http://stackoverflow.com/questions/14681144/httpclient-not-storing-cookies-in-cookiecontainer
-            IEnumerable<string> cookieHeaders;
             var responseCookies = new List<Tuple<string, string>>();
 
-            if (response.Headers.TryGetValues("set-cookie", out cookieHeaders))
+            if (response.Headers.TryGetValues("set-cookie", out var cookieHeaders))
             {
                 foreach (var value in cookieHeaders)
                 {
@@ -327,11 +325,10 @@ namespace Jackett.Common.Utils.Clients
             return result;
         }
 
-        override public void AddTrustedCertificate(string host, string hash)
+        public override void AddTrustedCertificate(string host, string hash)
         {
             hash = hash.ToUpper();
-            ICollection<string> hosts;
-            trustedCertificates.TryGetValue(hash.ToUpper(), out hosts);
+            trustedCertificates.TryGetValue(hash.ToUpper(), out var hosts);
             if (hosts == null)
             {
                 hosts = new HashSet<string>();
diff --git a/src/Jackett.Common/Utils/Clients/HttpWebClientNetCore.cs b/src/Jackett.Common/Utils/Clients/HttpWebClientNetCore.cs
index d8097ee42..c54aaef29 100644
--- a/src/Jackett.Common/Utils/Clients/HttpWebClientNetCore.cs
+++ b/src/Jackett.Common/Utils/Clients/HttpWebClientNetCore.cs
@@ -21,19 +21,18 @@ namespace Jackett.Common.Utils.Clients
     // custom HttpWebClient based WebClient for netcore (due to changed custom certificate validation API)
     public class HttpWebClientNetCore : WebClient
     {
-        static protected Dictionary<string, ICollection<string>> trustedCertificates = new Dictionary<string, ICollection<string>>();
-        static protected string webProxyUrl;
-        static protected IWebProxy webProxy;
+        protected static Dictionary<string, ICollection<string>> trustedCertificates = new Dictionary<string, ICollection<string>>();
+        protected static string webProxyUrl;
+        protected static IWebProxy webProxy;
 
         [DebuggerNonUserCode] // avoid "Exception User-Unhandled" Visual Studio messages
-        static public bool ValidateCertificate(HttpRequestMessage request, X509Certificate2 certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+        public static bool ValidateCertificate(HttpRequestMessage request, X509Certificate2 certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
         {
             {
                 var hash = certificate.GetCertHashString();
 
-                ICollection<string> hosts;
 
-                trustedCertificates.TryGetValue(hash, out hosts);
+                trustedCertificates.TryGetValue(hash, out var hosts);
                 if (hosts != null)
                 {
                     if (hosts.Contains(request.RequestUri.Host))
@@ -51,7 +50,7 @@ namespace Jackett.Common.Utils.Clients
             }
         }
 
-        static public void InitProxy(ServerConfig serverConfig)
+        public static void InitProxy(ServerConfig serverConfig)
         {
             // dispose old SocksWebProxy
             if (webProxy != null && webProxy is SocksWebProxy)
@@ -117,7 +116,7 @@ namespace Jackett.Common.Utils.Clients
                 InitProxy(serverConfig);
         }
 
-        override public void Init()
+        public override void Init()
         {
             ServicePointManager.DefaultConnectionLimit = 1000;
 
@@ -128,7 +127,7 @@ namespace Jackett.Common.Utils.Clients
             }
         }
 
-        override protected async Task<WebClientByteResult> Run(WebRequest webRequest)
+        protected override async Task<WebClientByteResult> Run(WebRequest webRequest)
         {
             ServicePointManager.SecurityProtocol = (SecurityProtocolType)192 | (SecurityProtocolType)768 | (SecurityProtocolType)3072;
 
@@ -150,12 +149,12 @@ namespace Jackett.Common.Utils.Clients
                 }
             }
 
-            string userAgent = webRequest.EmulateBrowser.Value ? BrowserUtil.ChromeUserAgent : "Jackett/" + configService.GetVersion();
+            var userAgent = webRequest.EmulateBrowser.Value ? BrowserUtil.ChromeUserAgent : "Jackett/" + configService.GetVersion();
 
-            using (ClearanceHandler clearanceHandlr = new ClearanceHandler(userAgent))
+            using (var clearanceHandlr = new ClearanceHandler(userAgent))
             {
                 clearanceHandlr.MaxTries = 30;
-                using (HttpClientHandler clientHandlr = new HttpClientHandler
+                using (var clientHandlr = new HttpClientHandler
                 {
                     CookieContainer = cookies,
                     AllowAutoRedirect = false, // Do not use this - Bugs ahoy! Lost cookies and more.
@@ -230,7 +229,7 @@ namespace Jackett.Common.Utils.Clients
 
                                 foreach (var header in response.Headers)
                                 {
-                                    IEnumerable<string> value = header.Value;
+                                    var value = header.Value;
                                     result.Headers[header.Key.ToLowerInvariant()] = value.ToArray();
                                 }
 
@@ -256,7 +255,7 @@ namespace Jackett.Common.Utils.Clients
                                                 // of this cloudflare approach..don't want to alter BaseWebResult.IsRedirect because normally
                                                 // it shoudln't include service unavailable..only if we have this redirect header.
                                                 response.StatusCode = System.Net.HttpStatusCode.Redirect;
-                                                redirtime = Int32.Parse(value.Substring(0, end));
+                                                redirtime = int.Parse(value.Substring(0, end));
                                                 System.Threading.Thread.Sleep(redirtime * 1000);
                                             }
                                         }
@@ -286,10 +285,9 @@ namespace Jackett.Common.Utils.Clients
                                 // Compatiblity issue between the cookie format and httpclient
                                 // Pull it out manually ignoring the expiry date then set it manually
                                 // http://stackoverflow.com/questions/14681144/httpclient-not-storing-cookies-in-cookiecontainer
-                                IEnumerable<string> cookieHeaders;
                                 var responseCookies = new List<Tuple<string, string>>();
 
-                                if (response.Headers.TryGetValues("set-cookie", out cookieHeaders))
+                                if (response.Headers.TryGetValues("set-cookie", out var cookieHeaders))
                                 {
                                     foreach (var value in cookieHeaders)
                                     {
@@ -316,11 +314,10 @@ namespace Jackett.Common.Utils.Clients
             }
         }
 
-        override public void AddTrustedCertificate(string host, string hash)
+        public override void AddTrustedCertificate(string host, string hash)
         {
             hash = hash.ToUpper();
-            ICollection<string> hosts;
-            trustedCertificates.TryGetValue(hash.ToUpper(), out hosts);
+            trustedCertificates.TryGetValue(hash.ToUpper(), out var hosts);
             if (hosts == null)
             {
                 hosts = new HashSet<string>();
diff --git a/src/Jackett.Common/Utils/Clients/WebClient.cs b/src/Jackett.Common/Utils/Clients/WebClient.cs
index d775b213d..3bd7e4a07 100644
--- a/src/Jackett.Common/Utils/Clients/WebClient.cs
+++ b/src/Jackett.Common/Utils/Clients/WebClient.cs
@@ -33,11 +33,11 @@ namespace Jackett.Common.Utils.Clients
             }
         }
 
-        virtual protected void OnConfigChange()
+        protected virtual void OnConfigChange()
         {
         }
 
-        virtual public void AddTrustedCertificate(string host, string hash)
+        public virtual void AddTrustedCertificate(string host, string hash)
         {
             // not implemented by default
         }
@@ -52,7 +52,7 @@ namespace Jackett.Common.Utils.Clients
             ServerConfigUnsubscriber = serverConfig.Subscribe(this);
         }
 
-        async protected Task DelayRequest(WebRequest request)
+        protected async Task DelayRequest(WebRequest request)
         {
             if (request.EmulateBrowser == null)
                 request.EmulateBrowser = EmulateBrowser;
@@ -69,7 +69,7 @@ namespace Jackett.Common.Utils.Clients
             }
         }
 
-        virtual protected void PrepareRequest(WebRequest request)
+        protected virtual void PrepareRequest(WebRequest request)
         {
             // add Accept/Accept-Language header if not set
             // some webservers won't accept requests without accept
@@ -97,7 +97,7 @@ namespace Jackett.Common.Utils.Clients
             return;
         }
 
-        virtual public async Task<WebClientByteResult> GetBytes(WebRequest request)
+        public virtual async Task<WebClientByteResult> GetBytes(WebRequest request)
         {
             logger.Debug(string.Format("WebClient({0}).GetBytes(Url:{1})", ClientType, request.Url));
             PrepareRequest(request);
@@ -109,7 +109,7 @@ namespace Jackett.Common.Utils.Clients
             return result;
         }
 
-        virtual public async Task<WebClientStringResult> GetString(WebRequest request)
+        public virtual async Task<WebClientStringResult> GetString(WebRequest request)
         {
             logger.Debug(string.Format("WebClient({0}).GetString(Url:{1})", ClientType, request.Url));
             PrepareRequest(request);
@@ -117,7 +117,7 @@ namespace Jackett.Common.Utils.Clients
             var result = await Run(request);
             lastRequest = DateTime.Now;
             result.Request = request;
-            WebClientStringResult stringResult = Mapper.Map<WebClientStringResult>(result);
+            var stringResult = Mapper.Map<WebClientStringResult>(result);
             Encoding encoding = null;
             if (request.Encoding != null)
             {
@@ -125,7 +125,7 @@ namespace Jackett.Common.Utils.Clients
             }
             else if (result.Headers.ContainsKey("content-type"))
             {
-                Regex CharsetRegex = new Regex(@"charset=([\w-]+)", RegexOptions.Compiled);
+                var CharsetRegex = new Regex(@"charset=([\w-]+)", RegexOptions.Compiled);
                 var CharsetRegexMatch = CharsetRegex.Match(result.Headers["content-type"][0]);
                 if (CharsetRegexMatch.Success)
                 {
@@ -158,8 +158,7 @@ namespace Jackett.Common.Utils.Clients
             stringResult.Content = decodedContent;
             logger.Debug(string.Format("WebClient({0}): Returning {1} => {2}", ClientType, result.Status, (result.IsRedirect ? result.RedirectingTo + " " : "") + (decodedContent == null ? "<NULL>" : decodedContent)));
 
-            string[] server;
-            if (stringResult.Headers.TryGetValue("server", out server))
+            if (stringResult.Headers.TryGetValue("server", out var server))
             {
                 if (server[0] == "cloudflare-nginx")
                     stringResult.Content = BrowserUtil.DecodeCloudFlareProtectedEmailFromHTML(stringResult.Content);
@@ -168,10 +167,10 @@ namespace Jackett.Common.Utils.Clients
         }
 
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-        virtual protected async Task<WebClientByteResult> Run(WebRequest webRequest) { throw new NotImplementedException(); }
+        protected virtual async Task<WebClientByteResult> Run(WebRequest webRequest) { throw new NotImplementedException(); }
 #pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
 
-        abstract public void Init();
+        public abstract void Init();
 
         public virtual void OnCompleted()
         {
@@ -201,7 +200,7 @@ namespace Jackett.Common.Utils.Clients
 
             // other encodings
             var builder = new StringBuilder();
-            foreach (KeyValuePair<string, string> pair in nameValueCollection)
+            foreach (var pair in nameValueCollection)
             {
                 if (builder.Length > 0)
                     builder.Append('&');
diff --git a/src/Jackett.Common/Utils/Clients/WebRequest.cs b/src/Jackett.Common/Utils/Clients/WebRequest.cs
index 69b764376..7d7b50606 100644
--- a/src/Jackett.Common/Utils/Clients/WebRequest.cs
+++ b/src/Jackett.Common/Utils/Clients/WebRequest.cs
@@ -36,7 +36,7 @@ namespace Jackett.Common.Utils.Clients
         /// </summary>
         public Dictionary<string, string> Headers { get; set; }
 
-        public override bool Equals(System.Object obj)
+        public override bool Equals(object obj)
         {
             if (obj is WebRequest)
             {
diff --git a/src/Jackett.Common/Utils/DataUrl.cs b/src/Jackett.Common/Utils/DataUrl.cs
index f64bbaf4f..ce7bcdbdf 100644
--- a/src/Jackett.Common/Utils/DataUrl.cs
+++ b/src/Jackett.Common/Utils/DataUrl.cs
@@ -8,7 +8,7 @@ namespace Jackett.Common.Utils
     {
         public static string ReadFileToDataUrl(string file)
         {
-            string mime = MimeUtility.GetMimeMapping(file);
+            var mime = MimeUtility.GetMimeMapping(file);
             return "data:" + mime + ";base64," + Convert.ToBase64String(File.ReadAllBytes(file));
         }
 
diff --git a/src/Jackett.Common/Utils/DateTimeUtil.cs b/src/Jackett.Common/Utils/DateTimeUtil.cs
index 293a76f46..97c2c07c7 100644
--- a/src/Jackett.Common/Utils/DateTimeUtil.cs
+++ b/src/Jackett.Common/Utils/DateTimeUtil.cs
@@ -10,15 +10,15 @@ namespace Jackett.Common.Utils
 
         public static DateTime UnixTimestampToDateTime(long unixTime)
         {
-            DateTime dt = new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc);
+            var dt = new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc);
             dt = dt.AddSeconds(unixTime).ToLocalTime();
             return dt;
         }
 
         public static DateTime UnixTimestampToDateTime(double unixTime)
         {
-            DateTime unixStart = new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc);
-            long unixTimeStampInTicks = (long)(unixTime * TimeSpan.TicksPerSecond);
+            var unixStart = new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc);
+            var unixTimeStampInTicks = (long)(unixTime * TimeSpan.TicksPerSecond);
             return new DateTime(unixStart.Ticks + unixTimeStampInTicks);
         }
 
@@ -43,13 +43,13 @@ namespace Jackett.Common.Utils
             str = str.Replace("ago", "");
             str = str.Replace("and", "");
 
-            TimeSpan timeAgo = TimeSpan.Zero;
-            Regex TimeagoRegex = new Regex(@"\s*?([\d\.]+)\s*?([^\d\s\.]+)\s*?");
+            var timeAgo = TimeSpan.Zero;
+            var TimeagoRegex = new Regex(@"\s*?([\d\.]+)\s*?([^\d\s\.]+)\s*?");
             var TimeagoMatches = TimeagoRegex.Match(str);
 
             while (TimeagoMatches.Success)
             {
-                string expanded = string.Empty;
+                var expanded = string.Empty;
 
                 var val = ParseUtil.CoerceFloat(TimeagoMatches.Groups[1].Value);
                 var unit = TimeagoMatches.Groups[2].Value;
@@ -83,7 +83,7 @@ namespace Jackett.Common.Utils
             if (string.IsNullOrWhiteSpace(time))
                 return TimeSpan.Zero;
 
-            TimeSpan offset = TimeSpan.Zero;
+            var offset = TimeSpan.Zero;
             if (time.EndsWith("AM"))
             {
                 time = time.Substring(0, time.Length - 2);
@@ -105,14 +105,14 @@ namespace Jackett.Common.Utils
         // http://www.codeproject.com/Articles/33298/C-Date-Time-Parser
         public static DateTime FromFuzzyTime(string str, string format = null)
         {
-            DateTimeRoutines.DateTimeRoutines.DateTimeFormat dt_format = DateTimeRoutines.DateTimeRoutines.DateTimeFormat.USA_DATE;
+            var dt_format = DateTimeRoutines.DateTimeRoutines.DateTimeFormat.USA_DATE;
             if (format == "UK")
             {
                 dt_format = DateTimeRoutines.DateTimeRoutines.DateTimeFormat.UK_DATE;
             }
 
-            DateTimeRoutines.DateTimeRoutines.ParsedDateTime dt;
-            if (DateTimeRoutines.DateTimeRoutines.TryParseDateOrTime(str, dt_format, out dt))
+            if (DateTimeRoutines.DateTimeRoutines.TryParseDateOrTime(str, dt_format, out
+            DateTimeRoutines.DateTimeRoutines.ParsedDateTime dt))
             {
                 return dt.DateTime;
             }
@@ -152,7 +152,7 @@ namespace Jackett.Common.Utils
                 if (match.Success)
                 {
                     var time = str.Replace(match.Groups[0].Value, "");
-                    DateTime dt = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified);
+                    var dt = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified);
                     dt += ParseTimeSpan(time);
                     return dt;
                 }
@@ -162,7 +162,7 @@ namespace Jackett.Common.Utils
                 if (match.Success)
                 {
                     var time = str.Replace(match.Groups[0].Value, "");
-                    DateTime dt = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified);
+                    var dt = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified);
                     dt += ParseTimeSpan(time);
                     dt -= TimeSpan.FromDays(1);
                     return dt;
@@ -173,7 +173,7 @@ namespace Jackett.Common.Utils
                 if (match.Success)
                 {
                     var time = str.Replace(match.Groups[0].Value, "");
-                    DateTime dt = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified);
+                    var dt = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified);
                     dt += ParseTimeSpan(time);
                     dt += TimeSpan.FromDays(1);
                     return dt;
@@ -184,7 +184,7 @@ namespace Jackett.Common.Utils
                 if (match.Success)
                 {
                     var time = str.Replace(match.Groups[0].Value, "");
-                    DateTime dt = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified);
+                    var dt = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified);
                     dt += ParseTimeSpan(time);
 
                     var dow = DayOfWeek.Monday;
@@ -225,7 +225,7 @@ namespace Jackett.Common.Utils
                 if (match.Success)
                 {
                     var date = match.Groups[1].Value;
-                    string newDate = DateTime.Now.Year.ToString() + "-" + date;
+                    var newDate = DateTime.Now.Year.ToString() + "-" + date;
                     str = str.Replace(date, newDate);
                 }
 
diff --git a/src/Jackett.Common/Utils/DotNetCoreUtil.cs b/src/Jackett.Common/Utils/DotNetCoreUtil.cs
index 74efe7786..a585ff069 100644
--- a/src/Jackett.Common/Utils/DotNetCoreUtil.cs
+++ b/src/Jackett.Common/Utils/DotNetCoreUtil.cs
@@ -9,7 +9,7 @@ namespace Jackett.Common.Utils
         {
             get
             {
-                bool runningOnDotNetCore = false;
+                var runningOnDotNetCore = false;
 
                 try
                 {
diff --git a/src/Jackett.Common/Utils/Extensions.cs b/src/Jackett.Common/Utils/Extensions.cs
index 367fca378..ee22e612d 100644
--- a/src/Jackett.Common/Utils/Extensions.cs
+++ b/src/Jackett.Common/Utils/Extensions.cs
@@ -28,7 +28,7 @@ namespace Jackett.Common.Utils
             return n.Value;
         }
 
-        private T Value;
+        private readonly T Value;
     }
 
     public static class GenericConversionExtensions
@@ -48,7 +48,7 @@ namespace Jackett.Common.Utils
     {
         public static string AsString(this IEnumerable<char> chars)
         {
-            return String.Concat(chars);
+            return string.Concat(chars);
         }
 
         public static bool IsEmpty<T>(this IEnumerable<T> collection)
diff --git a/src/Jackett.Common/Utils/ParseUtil.cs b/src/Jackett.Common/Utils/ParseUtil.cs
index 6c251a6ce..95623571d 100644
--- a/src/Jackett.Common/Utils/ParseUtil.cs
+++ b/src/Jackett.Common/Utils/ParseUtil.cs
@@ -91,7 +91,7 @@ namespace Jackett.Common.Utils
         {
             if (str == null)
                 return null;
-            Regex IdRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
+            var IdRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
             var IdMatch = IdRegEx.Match(str);
             if (!IdMatch.Success)
                 return null;
diff --git a/src/Jackett.Common/Utils/StringUtil.cs b/src/Jackett.Common/Utils/StringUtil.cs
index 0259728cb..ba09c8be3 100644
--- a/src/Jackett.Common/Utils/StringUtil.cs
+++ b/src/Jackett.Common/Utils/StringUtil.cs
@@ -22,20 +22,20 @@ namespace Jackett.Common.Utils
 
         public static string StripRegex(string str, string regex, string replacement = "")
         {
-            Regex rgx = new Regex(regex);
+            var rgx = new Regex(regex);
             str = rgx.Replace(str, replacement);
             return str;
         }
 
         // replaces culture specific characters with the corresponding base characters (e.g. è becomes e).
-        public static String RemoveDiacritics(String s)
+        public static string RemoveDiacritics(string s)
         {
-            String normalizedString = s.Normalize(NormalizationForm.FormD);
-            StringBuilder stringBuilder = new StringBuilder();
+            var normalizedString = s.Normalize(NormalizationForm.FormD);
+            var stringBuilder = new StringBuilder();
 
-            for (int i = 0; i < normalizedString.Length; i++)
+            for (var i = 0; i < normalizedString.Length; i++)
             {
-                Char c = normalizedString[i];
+                var c = normalizedString[i];
                 if (CharUnicodeInfo.GetUnicodeCategory(c) != UnicodeCategory.NonSpacingMark)
                     stringBuilder.Append(c);
             }
@@ -56,7 +56,7 @@ namespace Jackett.Common.Utils
         public static string HexStringFromBytes(byte[] bytes)
         {
             var sb = new StringBuilder();
-            foreach (byte b in bytes)
+            foreach (var b in bytes)
             {
                 var hex = b.ToString("x2");
                 sb.Append(hex);
@@ -73,8 +73,8 @@ namespace Jackett.Common.Utils
         {
             var sha1 = SHA1.Create();
 
-            byte[] bytes = Encoding.UTF8.GetBytes(s);
-            byte[] hashBytes = sha1.ComputeHash(bytes);
+            var bytes = Encoding.UTF8.GetBytes(s);
+            var hashBytes = sha1.ComputeHash(bytes);
 
             return HexStringFromBytes(hashBytes);
         }
@@ -82,10 +82,10 @@ namespace Jackett.Common.Utils
         public static string Hash(string s)
         {
             // Use input string to calculate MD5 hash
-            MD5 md5 = System.Security.Cryptography.MD5.Create();
+            var md5 = System.Security.Cryptography.MD5.Create();
 
-            byte[] inputBytes = System.Text.Encoding.ASCII.GetBytes(s);
-            byte[] hashBytes = md5.ComputeHash(inputBytes);
+            var inputBytes = System.Text.Encoding.ASCII.GetBytes(s);
+            var hashBytes = md5.ComputeHash(inputBytes);
 
             return HexStringFromBytes(hashBytes);
         }
@@ -100,15 +100,15 @@ namespace Jackett.Common.Utils
                                  Name = property.Name,
                                  Value = property.GetValue(exception, null)
                              })
-                             .Select(x => String.Format(
+                             .Select(x => string.Format(
                                  "{0} = {1}",
                                  x.Name,
-                                 x.Value != null ? x.Value.ToString() : String.Empty
+                                 x.Value != null ? x.Value.ToString() : string.Empty
                              ));
-            return String.Join("\n", fields);
+            return string.Join("\n", fields);
         }
 
-        static char[] MakeValidFileName_invalids;
+        private static char[] MakeValidFileName_invalids;
 
         /// <summary>Replaces characters in <c>text</c> that are not allowed in 
         /// file names with the specified replacement character.</summary>
@@ -118,12 +118,12 @@ namespace Jackett.Common.Utils
         /// <returns>A string that can be used as a filename. If the output string would otherwise be empty, returns "_".</returns>
         public static string MakeValidFileName(string text, char? replacement = '_', bool fancy = true)
         {
-            StringBuilder sb = new StringBuilder(text.Length);
+            var sb = new StringBuilder(text.Length);
             var invalids = MakeValidFileName_invalids ?? (MakeValidFileName_invalids = Path.GetInvalidFileNameChars());
-            bool changed = false;
-            for (int i = 0; i < text.Length; i++)
+            var changed = false;
+            for (var i = 0; i < text.Length; i++)
             {
-                char c = text[i];
+                var c = text[i];
                 if (invalids.Contains(c))
                 {
                     changed = true;
@@ -172,8 +172,8 @@ namespace Jackett.Common.Utils
             if (element == null)
                 return "<NULL>";
 
-            StringBuilder sb = new StringBuilder();
-            StringWriter sw = new StringWriter(sb);
+            var sb = new StringBuilder();
+            var sw = new StringWriter(sb);
             var formatter = new PrettyMarkupFormatter();
             element.ToHtml(sw, formatter);
             return sb.ToString();
diff --git a/src/Jackett.Common/Utils/TorznabCapsUtil.cs b/src/Jackett.Common/Utils/TorznabCapsUtil.cs
index 0d817a6da..60698f0f4 100644
--- a/src/Jackett.Common/Utils/TorznabCapsUtil.cs
+++ b/src/Jackett.Common/Utils/TorznabCapsUtil.cs
@@ -5,9 +5,8 @@ namespace Jackett.Common.Utils
 {
     public class TorznabUtil
     {
-        static Regex reduceSpacesRegex = new Regex("\\s{2,}", RegexOptions.Compiled);
-
-        static Regex findYearRegex = new Regex(@"(?<=\[|\(|\s)(\d{4})(?=\]|\)|\s)", RegexOptions.Compiled);
+        private static readonly Regex reduceSpacesRegex = new Regex("\\s{2,}", RegexOptions.Compiled);
+        private static readonly Regex findYearRegex = new Regex(@"(?<=\[|\(|\s)(\d{4})(?=\]|\)|\s)", RegexOptions.Compiled);
 
         public static TorznabCapabilities CreateDefaultTorznabTVCaps()
         {
diff --git a/src/Jackett.Common/Utils/TvCategoryParser.cs b/src/Jackett.Common/Utils/TvCategoryParser.cs
index a39273a63..43ab53a76 100644
--- a/src/Jackett.Common/Utils/TvCategoryParser.cs
+++ b/src/Jackett.Common/Utils/TvCategoryParser.cs
@@ -37,7 +37,7 @@ namespace Jackett.Common.Utils
 
         public static int ParseTvShowQuality(string tvShowFileName)
         {
-            string normalizedName = tvShowFileName.Trim().Replace('_', ' ').Trim().ToLower();
+            var normalizedName = tvShowFileName.Trim().Replace('_', ' ').Trim().ToLower();
 
             var sourceMatch = SourceRegex.Match(normalizedName);
             var resolutionMatch = ResolutionRegex.Match(normalizedName);
diff --git a/src/Jackett.IntegrationTests/DashboardTests.cs b/src/Jackett.IntegrationTests/DashboardTests.cs
index 4a9586613..3cf6d5ad2 100644
--- a/src/Jackett.IntegrationTests/DashboardTests.cs
+++ b/src/Jackett.IntegrationTests/DashboardTests.cs
@@ -11,21 +11,21 @@ namespace Jackett.IntegrationTests
         [TestMethod]
         public void CheckTitle()
         {
-            string pageTitle = _webDriver.Title;
+            var pageTitle = _webDriver.Title;
             Assert.AreEqual("Jackett", pageTitle);
         }
 
         [TestMethod]
         public void DefaultPortShown()
         {
-            string port = _webDriver.FindElement(By.CssSelector("#jackett-port")).GetAttribute("value");
+            var port = _webDriver.FindElement(By.CssSelector("#jackett-port")).GetAttribute("value");
             Assert.AreEqual("9117", port);
         }
 
         [TestMethod]
         public void IndexerTableIsPresent()
         {
-            IWebElement table = _webDriver.FindElement(By.CssSelector("#configured-indexer-datatable"));
+            var table = _webDriver.FindElement(By.CssSelector("#configured-indexer-datatable"));
             Assert.IsNotNull(table);
         }
 
@@ -34,7 +34,7 @@ namespace Jackett.IntegrationTests
         {
             _webDriver.FindElement(By.CssSelector("#jackett-add-indexer")).Click();
             WaitUntilModalIsDisplayed("#select-indexer-modal h4");
-            string modalHeading = _webDriver.FindElement(By.CssSelector("#select-indexer-modal h4")).Text;
+            var modalHeading = _webDriver.FindElement(By.CssSelector("#select-indexer-modal h4")).Text;
             Assert.AreEqual("Select an indexer to setup", modalHeading);
         }
 
@@ -43,7 +43,7 @@ namespace Jackett.IntegrationTests
         {
             _webDriver.FindElement(By.CssSelector("#jackett-add-indexer")).Click();
             WaitUntilModalIsDisplayed("#select-indexer-modal h4");
-            int indexerCount = _webDriver.FindElements(By.CssSelector("#unconfigured-indexer-datatable tbody tr")).Count;
+            var indexerCount = _webDriver.FindElements(By.CssSelector("#unconfigured-indexer-datatable tbody tr")).Count;
             Assert.IsTrue(indexerCount > 400);
         }
 
@@ -52,7 +52,7 @@ namespace Jackett.IntegrationTests
         {
             _webDriver.FindElement(By.CssSelector("#jackett-show-search")).Click();
             WaitUntilModalIsDisplayed("#select-indexer-modal div.modal-body p");
-            string modalDescription = _webDriver.FindElement(By.CssSelector("#select-indexer-modal div.modal-body p")).Text;
+            var modalDescription = _webDriver.FindElement(By.CssSelector("#select-indexer-modal div.modal-body p")).Text;
             Assert.AreEqual("You can search all configured indexers from this screen.", modalDescription);
         }
 
@@ -75,17 +75,17 @@ namespace Jackett.IntegrationTests
         [TestInitialize]
         public void LoadDashboard()
         {
-            string url = "http://localhost:9117/UI/Dashboard";
+            var url = "http://localhost:9117/UI/Dashboard";
             Console.WriteLine($"Url for test: {url}");
             _webDriver.Navigate().GoToUrl(url);
 
-            WebDriverWait wait = new WebDriverWait(_webDriver, TimeSpan.FromSeconds(20));
-            IWebElement element = wait.Until(x => x.FindElement(By.CssSelector("#configured-indexer-datatable")));
+            var wait = new WebDriverWait(_webDriver, TimeSpan.FromSeconds(20));
+            var element = wait.Until(x => x.FindElement(By.CssSelector("#configured-indexer-datatable")));
         }
 
         private bool WaitUntilModalIsDisplayed(string cssSelector)
         {
-            WebDriverWait wait = new WebDriverWait(_webDriver, TimeSpan.FromSeconds(5));
+            var wait = new WebDriverWait(_webDriver, TimeSpan.FromSeconds(5));
             var element = wait.Until(condition =>
             {
                 try
diff --git a/src/Jackett.Server/Controllers/BlackholeController.cs b/src/Jackett.Server/Controllers/BlackholeController.cs
index 4e243f5c8..9d9e72861 100644
--- a/src/Jackett.Server/Controllers/BlackholeController.cs
+++ b/src/Jackett.Server/Controllers/BlackholeController.cs
@@ -18,10 +18,10 @@ namespace Jackett.Server.Controllers
     [Route("bh/{indexerID}")]
     public class BlackholeController : Controller
     {
-        private Logger logger;
-        private IIndexerManagerService indexerService;
-        private ServerConfig serverConfig;
-        private IProtectionService protectionService;
+        private readonly Logger logger;
+        private readonly IIndexerManagerService indexerService;
+        private readonly ServerConfig serverConfig;
+        private readonly IProtectionService protectionService;
 
         public BlackholeController(IIndexerManagerService i, Logger l, ServerConfig sConfig, IProtectionService ps)
         {
diff --git a/src/Jackett.Server/Controllers/DownloadController.cs b/src/Jackett.Server/Controllers/DownloadController.cs
index 97ed3d140..d10b9e001 100644
--- a/src/Jackett.Server/Controllers/DownloadController.cs
+++ b/src/Jackett.Server/Controllers/DownloadController.cs
@@ -20,10 +20,10 @@ namespace Jackett.Server.Controllers
     [Route("dl/{indexerID}")]
     public class DownloadController : Controller
     {
-        private ServerConfig serverConfig;
-        private Logger logger;
-        private IIndexerManagerService indexerService;
-        private IProtectionService protectionService;
+        private readonly ServerConfig serverConfig;
+        private readonly Logger logger;
+        private readonly IIndexerManagerService indexerService;
+        private readonly IProtectionService protectionService;
 
         public DownloadController(IIndexerManagerService i, Logger l, IProtectionService ps, ServerConfig sConfig)
         {
@@ -89,7 +89,7 @@ namespace Jackett.Server.Controllers
                     throw new Exception("BencodeParser failed", e);
                 }
 
-                string fileName = StringUtil.MakeValidFileName(file, '_', false) + ".torrent"; // call MakeValidFileName again to avoid any kind of injection attack
+                var fileName = StringUtil.MakeValidFileName(file, '_', false) + ".torrent"; // call MakeValidFileName again to avoid any kind of injection attack
 
                 return File(sortedDownloadBytes, "application/x-bittorrent", fileName);
             }
diff --git a/src/Jackett.Server/Controllers/IndexerApiController.cs b/src/Jackett.Server/Controllers/IndexerApiController.cs
index cee58c577..310f8f180 100644
--- a/src/Jackett.Server/Controllers/IndexerApiController.cs
+++ b/src/Jackett.Server/Controllers/IndexerApiController.cs
@@ -59,9 +59,9 @@ namespace Jackett.Server.Controllers
     {
         public IIndexerManagerService IndexerService { get; private set; }
         public IIndexer CurrentIndexer { get; set; }
-        private Logger logger;
-        private IServerService serverService;
-        private ICacheService cacheService;
+        private readonly Logger logger;
+        private readonly IServerService serverService;
+        private readonly ICacheService cacheService;
 
         public IndexerApiController(IIndexerManagerService indexerManagerService, IServerService ss, ICacheService c, Logger logger)
         {
diff --git a/src/Jackett.Server/Controllers/ResultsController.cs b/src/Jackett.Server/Controllers/ResultsController.cs
index 612314c74..61bdddb77 100644
--- a/src/Jackett.Server/Controllers/ResultsController.cs
+++ b/src/Jackett.Server/Controllers/ResultsController.cs
@@ -170,10 +170,10 @@ namespace Jackett.Server.Controllers
         public IIndexerManagerService IndexerService { get; private set; }
         public IIndexer CurrentIndexer { get; set; }
         public TorznabQuery CurrentQuery { get; set; }
-        private Logger logger;
-        private IServerService serverService;
-        private ICacheService cacheService;
-        private Common.Models.Config.ServerConfig serverConfig;
+        private readonly Logger logger;
+        private readonly IServerService serverService;
+        private readonly ICacheService cacheService;
+        private readonly Common.Models.Config.ServerConfig serverConfig;
 
         public ResultsController(IIndexerManagerService indexerManagerService, IServerService ss, ICacheService c, Logger logger, Common.Models.Config.ServerConfig sConfig)
         {
@@ -190,7 +190,7 @@ namespace Jackett.Server.Controllers
         {
             //TODO: Better way to parse querystring
 
-            ApiSearch request = new ApiSearch();
+            var request = new ApiSearch();
 
             foreach (var t in Request.Query)
             {
@@ -201,7 +201,7 @@ namespace Jackett.Server.Controllers
 
                 if (t.Key == "Category[]")
                 {
-                    request.Category = t.Value.ToString().Split(',').Select(Int32.Parse).ToArray();
+                    request.Category = t.Value.ToString().Split(',').Select(int.Parse).ToArray();
                     CurrentQuery.Categories = request.Category;
                 }
 
@@ -452,11 +452,11 @@ namespace Jackett.Server.Controllers
 
         public static IActionResult GetErrorActionResult(RouteData routeData, HttpStatusCode status, int torznabCode, string description)
         {
-            bool isTorznab = routeData.Values["action"].ToString().Equals("torznab", StringComparison.OrdinalIgnoreCase);
+            var isTorznab = routeData.Values["action"].ToString().Equals("torznab", StringComparison.OrdinalIgnoreCase);
 
             if (isTorznab)
             {
-                ContentResult contentResult = new ContentResult
+                var contentResult = new ContentResult
                 {
                     Content = CreateErrorXML(torznabCode, description),
                     ContentType = "application/xml",
diff --git a/src/Jackett.Server/Controllers/ServerConfigurationController.cs b/src/Jackett.Server/Controllers/ServerConfigurationController.cs
index 212b17094..682683ba9 100644
--- a/src/Jackett.Server/Controllers/ServerConfigurationController.cs
+++ b/src/Jackett.Server/Controllers/ServerConfigurationController.cs
@@ -17,14 +17,14 @@ namespace Jackett.Server.Controllers
     public class ServerConfigurationController : Controller
     {
         private readonly IConfigurationService configService;
-        private ServerConfig serverConfig;
-        private IServerService serverService;
-        private IProcessService processService;
-        private IIndexerManagerService indexerService;
-        private ISecuityService securityService;
-        private IUpdateService updater;
-        private ILogCacheService logCache;
-        private Logger logger;
+        private readonly ServerConfig serverConfig;
+        private readonly IServerService serverService;
+        private readonly IProcessService processService;
+        private readonly IIndexerManagerService indexerService;
+        private readonly ISecuityService securityService;
+        private readonly IUpdateService updater;
+        private readonly ILogCacheService logCache;
+        private readonly Logger logger;
 
         public ServerConfigurationController(IConfigurationService c, IServerService s, IProcessService p, IIndexerManagerService i, ISecuityService ss, IUpdateService u, ILogCacheService lc, Logger l, ServerConfig sc)
         {
@@ -72,17 +72,17 @@ namespace Jackett.Server.Controllers
         [HttpPost]
         public IActionResult UpdateConfig([FromBody]Common.Models.DTO.ServerConfig config)
         {
-            bool webHostRestartNeeded = false;
+            var webHostRestartNeeded = false;
 
             var originalPort = serverConfig.Port;
             var originalAllowExternal = serverConfig.AllowExternal;
-            int port = config.port;
-            bool external = config.external;
-            string saveDir = config.blackholedir;
-            bool updateDisabled = config.updatedisabled;
-            bool preRelease = config.prerelease;
-            bool logging = config.logging;
-            string basePathOverride = config.basepathoverride;
+            var port = config.port;
+            var external = config.external;
+            var saveDir = config.blackholedir;
+            var updateDisabled = config.updatedisabled;
+            var preRelease = config.prerelease;
+            var logging = config.logging;
+            var basePathOverride = config.basepathoverride;
             if (basePathOverride != null)
             {
                 basePathOverride = basePathOverride.TrimEnd('/');
@@ -90,8 +90,8 @@ namespace Jackett.Server.Controllers
                     throw new Exception("The Base Path Override must start with a /");
             }
 
-            string omdbApiKey = config.omdbkey;
-            string omdbApiUrl = config.omdburl;
+            var omdbApiKey = config.omdbkey;
+            var omdbApiUrl = config.omdburl;
 
             if (config.basepathoverride != serverConfig.BasePathOverride)
             {
diff --git a/src/Jackett.Server/Controllers/UIController.cs b/src/Jackett.Server/Controllers/UIController.cs
index 8bd8575ad..ff1d9671d 100644
--- a/src/Jackett.Server/Controllers/UIController.cs
+++ b/src/Jackett.Server/Controllers/UIController.cs
@@ -17,10 +17,10 @@ namespace Jackett.Server.Controllers
     [ResponseCache(Location = ResponseCacheLocation.None, NoStore = true)]
     public class WebUIController : Controller
     {
-        private IConfigurationService config;
-        private ServerConfig serverConfig;
-        private ISecuityService securityService;
-        private Logger logger;
+        private readonly IConfigurationService config;
+        private readonly ServerConfig serverConfig;
+        private readonly ISecuityService securityService;
+        private readonly Logger logger;
 
         public WebUIController(IConfigurationService config, ISecuityService ss, ServerConfig s, Logger l)
         {
@@ -71,8 +71,8 @@ namespace Jackett.Server.Controllers
         [HttpGet]
         public IActionResult Dashboard()
         {
-            bool logout = HttpContext.Request.Query.Where(x => String.Equals(x.Key, "logout", StringComparison.OrdinalIgnoreCase)
-                                                            && String.Equals(x.Value, "true", StringComparison.OrdinalIgnoreCase)).Any();
+            var logout = HttpContext.Request.Query.Where(x => string.Equals(x.Key, "logout", StringComparison.OrdinalIgnoreCase)
+                                                            && string.Equals(x.Value, "true", StringComparison.OrdinalIgnoreCase)).Any();
 
             if (logout)
             {
diff --git a/src/Jackett.Server/Helper.cs b/src/Jackett.Server/Helper.cs
index 1b2798b05..4b2df350e 100644
--- a/src/Jackett.Server/Helper.cs
+++ b/src/Jackett.Server/Helper.cs
@@ -136,7 +136,7 @@ namespace Jackett.Server
 
         public static void SetupLogging(ContainerBuilder builder)
         {
-            Logger logger = LogManager.GetCurrentClassLogger();
+            var logger = LogManager.GetCurrentClassLogger();
 
             if (builder != null)
             {
diff --git a/src/Jackett.Server/Initialisation.cs b/src/Jackett.Server/Initialisation.cs
index fc0a4b10b..d7a87eb0a 100644
--- a/src/Jackett.Server/Initialisation.cs
+++ b/src/Jackett.Server/Initialisation.cs
@@ -106,7 +106,7 @@ namespace Jackett.Server
             // Override port
             if (consoleOptions.Port != 0)
             {
-                Int32.TryParse(serverConfig.Port.ToString(), out Int32 configPort);
+                int.TryParse(serverConfig.Port.ToString(), out var configPort);
 
                 if (configPort != consoleOptions.Port)
                 {
diff --git a/src/Jackett.Server/Middleware/CustomExceptionHandler.cs b/src/Jackett.Server/Middleware/CustomExceptionHandler.cs
index f6a5fbb16..e2106bbc6 100644
--- a/src/Jackett.Server/Middleware/CustomExceptionHandler.cs
+++ b/src/Jackett.Server/Middleware/CustomExceptionHandler.cs
@@ -11,7 +11,7 @@ namespace Jackett.Server.Middleware
     public class CustomExceptionHandler
     {
         private readonly RequestDelegate _next;
-        private Logger logger;
+        private readonly Logger logger;
 
         public CustomExceptionHandler(RequestDelegate next, Logger l)
         {
@@ -29,7 +29,7 @@ namespace Jackett.Server.Middleware
             {
                 try
                 {
-                    string msg = "";
+                    var msg = "";
                     var json = new JObject();
 
                     logger.Error(ex);
diff --git a/src/Jackett.Server/Middleware/RedirectRules.cs b/src/Jackett.Server/Middleware/RedirectRules.cs
index 198f04b92..888b1ccf6 100644
--- a/src/Jackett.Server/Middleware/RedirectRules.cs
+++ b/src/Jackett.Server/Middleware/RedirectRules.cs
@@ -9,7 +9,7 @@ namespace Jackett.Server.Middleware
     {
         public static void RedirectToDashboard(RewriteContext context)
         {
-            HttpRequest request = context.HttpContext.Request;
+            var request = context.HttpContext.Request;
 
             if (request.Path == null || string.IsNullOrWhiteSpace(request.Path.ToString()) || request.Path.ToString() == "/"
                 || request.Path.ToString().Equals("/index.html", StringComparison.OrdinalIgnoreCase))
diff --git a/src/Jackett.Server/Program.cs b/src/Jackett.Server/Program.cs
index 678f9f5be..c94d0ec98 100644
--- a/src/Jackett.Server/Program.cs
+++ b/src/Jackett.Server/Program.cs
@@ -31,7 +31,7 @@ namespace Jackett.Server
             var commandLineParser = new Parser(settings => settings.CaseSensitive = false);
             var optionsResult = commandLineParser.ParseArguments<ConsoleOptions>(args);
             var runtimeDictionary = new Dictionary<string, string>();
-            ConsoleOptions consoleOptions = new ConsoleOptions();
+            var consoleOptions = new ConsoleOptions();
 
             optionsResult.WithNotParsed(errors =>
             {
@@ -63,7 +63,7 @@ namespace Jackett.Server
             });
 
             LogManager.Configuration = LoggingSetup.GetLoggingConfiguration(Settings);
-            Logger logger = LogManager.GetCurrentClassLogger();
+            var logger = LogManager.GetCurrentClassLogger();
             logger.Info("Starting Jackett v" + EnvironmentUtil.JackettVersion);
 
             // create PID file early
@@ -89,11 +89,11 @@ namespace Jackett.Server
 
             if (consoleOptions.Install || consoleOptions.Uninstall || consoleOptions.StartService || consoleOptions.StopService || consoleOptions.ReserveUrls)
             {
-                bool isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
+                var isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
 
                 if (isWindows)
                 {
-                    ServerConfig serverConfig = configurationService.BuildServerConfig(Settings);
+                    var serverConfig = configurationService.BuildServerConfig(Settings);
                     Initialisation.ProcessWindowsSpecificArgs(consoleOptions, processService, serverConfig, logger);
                 }
                 else
@@ -115,21 +115,21 @@ namespace Jackett.Server
                 {
                     if (consoleOptions.Port != 0 || consoleOptions.ListenPublic || consoleOptions.ListenPrivate)
                     {
-                        ServerConfig serverConfiguration = configurationService.BuildServerConfig(Settings);
+                        var serverConfiguration = configurationService.BuildServerConfig(Settings);
                         Initialisation.ProcessConsoleOverrides(consoleOptions, processService, serverConfiguration, configurationService, logger);
                     }
                 }
 
-                ServerConfig serverConfig = configurationService.BuildServerConfig(Settings);
-                Int32.TryParse(serverConfig.Port.ToString(), out Int32 configPort);
-                string[] url = serverConfig.GetListenAddresses(serverConfig.AllowExternal);
+                var serverConfig = configurationService.BuildServerConfig(Settings);
+                int.TryParse(serverConfig.Port.ToString(), out var configPort);
+                var url = serverConfig.GetListenAddresses(serverConfig.AllowExternal);
 
                 isWebHostRestart = false;
 
                 try
                 {
                     logger.Debug("Creating web host...");
-                    string applicationFolder = Path.Combine(configurationService.ApplicationFolder(), "Content");
+                    var applicationFolder = Path.Combine(configurationService.ApplicationFolder(), "Content");
                     logger.Debug($"Content root path is: {applicationFolder}");
 
                     CreateWebHostBuilder(args, url, applicationFolder).Build().Run();
diff --git a/src/Jackett.Server/Services/FilePermissionService.cs b/src/Jackett.Server/Services/FilePermissionService.cs
index 56f78f1ca..d3ac38005 100644
--- a/src/Jackett.Server/Services/FilePermissionService.cs
+++ b/src/Jackett.Server/Services/FilePermissionService.cs
@@ -9,7 +9,7 @@ namespace Jackett.Server.Services
 {
     public class FilePermissionService : IFilePermissionService
     {
-        private Logger logger;
+        private readonly Logger logger;
 
         public FilePermissionService(Logger l)
         {
@@ -26,7 +26,7 @@ namespace Jackett.Server.Services
             logger.Debug($"Attempting to give execute permission to: {path}");
             try
             {
-                UnixFileInfo jackettUpdaterFI = new UnixFileInfo(path)
+                var jackettUpdaterFI = new UnixFileInfo(path)
                 {
                     FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.OtherRead
                 };
diff --git a/src/Jackett.Server/Services/ProtectionService.cs b/src/Jackett.Server/Services/ProtectionService.cs
index fa4d39bc3..20f845dbb 100644
--- a/src/Jackett.Server/Services/ProtectionService.cs
+++ b/src/Jackett.Server/Services/ProtectionService.cs
@@ -15,11 +15,11 @@ namespace Jackett.Server.Services
 
     public class ProtectionService : IProtectionService
     {
-        DataProtectionScope PROTECTION_SCOPE = DataProtectionScope.LocalMachine;
+        private readonly DataProtectionScope PROTECTION_SCOPE = DataProtectionScope.LocalMachine;
         private const string JACKETT_KEY = "JACKETT_KEY";
-        const string APPLICATION_KEY = "Dvz66r3n8vhTGip2/quiw5ISyM37f7L2iOdupzdKmzkvXGhAgQiWK+6F+4qpxjPVNks1qO7LdWuVqRlzgLzeW8mChC6JnBMUS1Fin4N2nS9lh4XPuCZ1che75xO92Nk2vyXUo9KSFG1hvEszAuLfG2Mcg1r0sVyVXd2gQDU/TbY=";
-        private byte[] _instanceKey;
-        IDataProtector _protector = null;
+        private const string APPLICATION_KEY = "Dvz66r3n8vhTGip2/quiw5ISyM37f7L2iOdupzdKmzkvXGhAgQiWK+6F+4qpxjPVNks1qO7LdWuVqRlzgLzeW8mChC6JnBMUS1Fin4N2nS9lh4XPuCZ1che75xO92Nk2vyXUo9KSFG1hvEszAuLfG2Mcg1r0sVyVXd2gQDU/TbY=";
+        private readonly byte[] _instanceKey;
+        private readonly IDataProtector _protector = null;
 
         public ProtectionService(ServerConfig config, IDataProtectionProvider provider = null)
         {
@@ -33,7 +33,7 @@ namespace Jackett.Server.Services
             if (provider != null)
             {
                 var jackettKey = Environment.GetEnvironmentVariable(JACKETT_KEY);
-                string purpose = string.IsNullOrEmpty(jackettKey) ? APPLICATION_KEY : jackettKey.ToString();
+                var purpose = string.IsNullOrEmpty(jackettKey) ? APPLICATION_KEY : jackettKey.ToString();
 
                 _protector = provider.CreateProtector(purpose);
             }
@@ -98,9 +98,9 @@ namespace Jackett.Server.Services
 
             var protectedBytes = ProtectedData.Protect(plainBytes, entropy, PROTECTION_SCOPE);
 
-            using (MemoryStream ms = new MemoryStream())
+            using (var ms = new MemoryStream())
             {
-                using (RijndaelManaged AES = new RijndaelManaged())
+                using (var AES = new RijndaelManaged())
                 {
                     AES.KeySize = 256;
                     AES.BlockSize = 128;
@@ -131,9 +131,9 @@ namespace Jackett.Server.Services
             var protectedBytes = Convert.FromBase64String(plainText);
             var instanceKey = _instanceKey;
 
-            using (MemoryStream ms = new MemoryStream())
+            using (var ms = new MemoryStream())
             {
-                using (RijndaelManaged AES = new RijndaelManaged())
+                using (var AES = new RijndaelManaged())
                 {
                     AES.KeySize = 256;
                     AES.BlockSize = 128;
diff --git a/src/Jackett.Server/Services/SecuityService.cs b/src/Jackett.Server/Services/SecuityService.cs
index ff3d81f61..249f16fad 100644
--- a/src/Jackett.Server/Services/SecuityService.cs
+++ b/src/Jackett.Server/Services/SecuityService.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Net.Http;
 using System.Security.Cryptography;
 using System.Text;
@@ -8,11 +7,10 @@ using Jackett.Common.Services.Interfaces;
 
 namespace Jackett.Server.Services
 {
-
-    class SecuityService : ISecuityService
+    internal class SecuityService : ISecuityService
     {
         private const string COOKIENAME = "JACKETT";
-        private ServerConfig _serverConfig;
+        private readonly ServerConfig _serverConfig;
 
         public SecuityService(ServerConfig sc)
         {
@@ -26,17 +24,17 @@ namespace Jackett.Server.Services
             // Append key as salt
             input += _serverConfig.APIKey;
 
-            UnicodeEncoding UE = new UnicodeEncoding();
+            var UE = new UnicodeEncoding();
             byte[] hashValue;
-            byte[] message = UE.GetBytes(input);
+            var message = UE.GetBytes(input);
 
-            SHA512Managed hashString = new SHA512Managed();
-            string hex = "";
+            var hashString = new SHA512Managed();
+            var hex = "";
 
             hashValue = hashString.ComputeHash(message);
-            foreach (byte x in hashValue)
+            foreach (var x in hashValue)
             {
-                hex += String.Format("{0:x2}", x);
+                hex += string.Format("{0:x2}", x);
             }
             return hex;
         }
diff --git a/src/Jackett.Server/Services/ServerService.cs b/src/Jackett.Server/Services/ServerService.cs
index 0085dcbcb..ec634a91b 100644
--- a/src/Jackett.Server/Services/ServerService.cs
+++ b/src/Jackett.Server/Services/ServerService.cs
@@ -22,16 +22,16 @@ namespace Jackett.Server.Services
 {
     public class ServerService : IServerService
     {
-        private IIndexerManagerService indexerService;
-        private IProcessService processService;
-        private ISerializeService serializeService;
-        private IConfigurationService configService;
-        private Logger logger;
-        private Common.Utils.Clients.WebClient client;
-        private IUpdateService updater;
-        private List<string> _notices = new List<string>();
-        private ServerConfig config;
-        private IProtectionService _protectionService;
+        private readonly IIndexerManagerService indexerService;
+        private readonly IProcessService processService;
+        private readonly ISerializeService serializeService;
+        private readonly IConfigurationService configService;
+        private readonly Logger logger;
+        private readonly Common.Utils.Clients.WebClient client;
+        private readonly IUpdateService updater;
+        private readonly List<string> _notices = new List<string>();
+        private readonly ServerConfig config;
+        private readonly IProtectionService _protectionService;
         private bool isDotNetCoreCapable;
 
         public ServerService(IIndexerManagerService i, IProcessService p, ISerializeService s, IConfigurationService c, Logger l, Common.Utils.Clients.WebClient w, IUpdateService u, IProtectionService protectionService, ServerConfig serverConfig)
@@ -62,7 +62,7 @@ namespace Jackett.Server.Services
 
             var encryptedLink = _protectionService.Protect(link.ToString());
             var encodedLink = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(encryptedLink));
-            string urlEncodedFile = WebUtility.UrlEncode(file);
+            var urlEncodedFile = WebUtility.UrlEncode(file);
             var proxyLink = string.Format("{0}{1}/{2}/?jackett_apikey={3}&path={4}&file={5}", serverUrl, action, indexerId, config.APIKey, encodedLink, urlEncodedFile);
             return new Uri(proxyLink);
         }
@@ -93,13 +93,13 @@ namespace Jackett.Server.Services
                 var runtimedir = RuntimeEnvironment.GetRuntimeDirectory();
                 logger.Info("Environment version: " + Environment.Version.ToString() + " (" + runtimedir + ")");
                 logger.Info("OS version: " + Environment.OSVersion.ToString() + (Environment.Is64BitOperatingSystem ? " (64bit OS)" : "") + (Environment.Is64BitProcess ? " (64bit process)" : ""));
-                Variants variants = new Variants();
-                Variants.JackettVariant variant = variants.GetVariant();
+                var variants = new Variants();
+                var variant = variants.GetVariant();
                 logger.Info("Jackett variant: " + variant.ToString());
 
                 try
                 {
-                    ThreadPool.GetMaxThreads(out int workerThreads, out int completionPortThreads);
+                    ThreadPool.GetMaxThreads(out var workerThreads, out var completionPortThreads);
                     logger.Info("ThreadPool MaxThreads: " + workerThreads + " workerThreads, " + completionPortThreads + " completionPortThreads");
                 }
                 catch (Exception e)
@@ -114,9 +114,9 @@ namespace Jackett.Server.Services
                     var issuefile = "/etc/issue";
                     if (File.Exists(issuefile))
                     {
-                        using (StreamReader reader = new StreamReader(issuefile))
+                        using (var reader = new StreamReader(issuefile))
                         {
-                            string firstLine = reader.ReadLine();
+                            var firstLine = reader.ReadLine();
                             if (firstLine != null)
                                 logger.Info("issue: " + firstLine);
                         }
@@ -127,10 +127,10 @@ namespace Jackett.Server.Services
                     logger.Error(e, "Error while reading the issue file");
                 }
 
-                Type monotype = Type.GetType("Mono.Runtime");
+                var monotype = Type.GetType("Mono.Runtime");
                 if (monotype != null && !DotNetCoreUtil.IsRunningOnDotNetCore)
                 {
-                    MethodInfo displayName = monotype.GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static);
+                    var displayName = monotype.GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static);
                     var monoVersion = "unknown";
                     if (displayName != null)
                         monoVersion = displayName.Invoke(null, null).ToString();
@@ -149,7 +149,7 @@ namespace Jackett.Server.Services
 
                     if (monoVersionO.Major < 5 || (monoVersionO.Major == 5 && monoVersionO.Minor < 8))
                     {
-                        string notice = "A minimum Mono version of 5.8 is required. Please update to the latest version from http://www.mono-project.com/download/";
+                        var notice = "A minimum Mono version of 5.8 is required. Please update to the latest version from http://www.mono-project.com/download/";
                         _notices.Add(notice);
                         logger.Error(notice);
                     }
@@ -202,7 +202,7 @@ namespace Jackett.Server.Services
                     try
                     {
                         var monoSecurity = Assembly.Load("Mono.Security");
-                        Type monoX509StoreManager = monoSecurity.GetType("Mono.Security.X509.X509StoreManager");
+                        var monoX509StoreManager = monoSecurity.GetType("Mono.Security.X509.X509StoreManager");
                         if (monoX509StoreManager != null)
                         {
                             var TrustedRootCertificatesProperty = monoX509StoreManager.GetProperty("TrustedRootCertificates");
@@ -233,7 +233,7 @@ namespace Jackett.Server.Services
                                 notice += logSpacer + "If you don't have root access or you're running MacOS, please run the following command as the jackett user (" + Environment.UserName + "):<br/>\n";
                                 notice += logSpacer + "<pre>" + CommandUser + "</pre>";
                                 _notices.Add(notice);
-                                logger.Error(Regex.Replace(notice, "<.*?>", String.Empty));
+                                logger.Error(Regex.Replace(notice, "<.*?>", string.Empty));
                             }
                         }
                     }
@@ -266,12 +266,12 @@ namespace Jackett.Server.Services
             //Warn user that they are using an old version of Jackett
             try
             {
-                DateTime compiledData = BuildDate.GetBuildDateTime();
+                var compiledData = BuildDate.GetBuildDateTime();
 
                 if (compiledData < DateTime.Now.AddMonths(-3))
                 {
-                    string version = configService.GetVersion();
-                    string notice = $"Your version of Jackett v{version} is very old. Multiple indexers are likely to fail when using an old version. Update to the latest version of Jackett.";
+                    var version = configService.GetVersion();
+                    var notice = $"Your version of Jackett v{version} is very old. Multiple indexers are likely to fail when using an old version. Update to the latest version of Jackett.";
                     _notices.Add(notice);
                     logger.Error(notice);
                 }
@@ -284,18 +284,18 @@ namespace Jackett.Server.Services
             //Alert user that they no longer need to use Mono
             try
             {
-                Variants variants = new Variants();
-                Variants.JackettVariant variant = variants.GetVariant();
+                var variants = new Variants();
+                var variant = variants.GetVariant();
 
                 if (variant == Variants.JackettVariant.Mono)
                 {
-                    Process process = new Process();
+                    var process = new Process();
                     process.StartInfo.FileName = "uname";
                     process.StartInfo.Arguments = "-m";
                     process.StartInfo.UseShellExecute = false;
                     process.StartInfo.RedirectStandardOutput = true;
                     process.Start();
-                    string output = process.StandardOutput.ReadToEnd();
+                    var output = process.StandardOutput.ReadToEnd();
                     process.WaitForExit();
                     logger.Debug($"uname output was: {output}");
 
@@ -348,7 +348,7 @@ namespace Jackett.Server.Services
 
         public string GetServerUrl(HttpRequest request)
         {
-            string serverUrl = "";
+            var serverUrl = "";
 
             var scheme = request.Scheme;
             var port = request.HttpContext.Request.Host.Port;
diff --git a/src/Jackett.Server/Services/ServiceConfigService.cs b/src/Jackett.Server/Services/ServiceConfigService.cs
index 2d8e9c7f0..2992db052 100644
--- a/src/Jackett.Server/Services/ServiceConfigService.cs
+++ b/src/Jackett.Server/Services/ServiceConfigService.cs
@@ -16,8 +16,8 @@ namespace Jackett.Server.Services
         private const string DESCRIPTION = "API Support for your favorite torrent trackers";
         private const string SERVICEEXE = "JackettService.exe";
 
-        private IProcessService processService;
-        private Logger logger;
+        private readonly IProcessService processService;
+        private readonly Logger logger;
 
         public ServiceConfigService()
         {
@@ -53,7 +53,7 @@ namespace Jackett.Server.Services
 
         public ServiceController GetService(string serviceName)
         {
-            return ServiceController.GetServices().FirstOrDefault(c => String.Equals(c.ServiceName, serviceName, StringComparison.InvariantCultureIgnoreCase));
+            return ServiceController.GetServices().FirstOrDefault(c => string.Equals(c.ServiceName, serviceName, StringComparison.InvariantCultureIgnoreCase));
         }
 
         public void Install()
@@ -64,7 +64,7 @@ namespace Jackett.Server.Services
             }
             else
             {
-                string applicationFolder = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
+                var applicationFolder = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
 
                 var exePath = Path.Combine(applicationFolder, SERVICEEXE);
                 if (!File.Exists(exePath) && Debugger.IsAttached)
@@ -72,7 +72,7 @@ namespace Jackett.Server.Services
                     exePath = Path.Combine(applicationFolder, "..\\..\\..\\Jackett.Service\\bin\\Debug", SERVICEEXE);
                 }
 
-                string arg = $"create {NAME} start= auto binpath= \"{exePath}\" DisplayName= {NAME}";
+                var arg = $"create {NAME} start= auto binpath= \"{exePath}\" DisplayName= {NAME}";
 
                 processService.StartProcessAndLog("sc.exe", arg, true);
 
diff --git a/src/Jackett.Server/Startup.cs b/src/Jackett.Server/Startup.cs
index 2ed49de21..208fb1cad 100644
--- a/src/Jackett.Server/Startup.cs
+++ b/src/Jackett.Server/Startup.cs
@@ -79,10 +79,10 @@ namespace Jackett.Server
                     });
 #endif
 
-            RuntimeSettings runtimeSettings = new RuntimeSettings();
+            var runtimeSettings = new RuntimeSettings();
             Configuration.GetSection("RuntimeSettings").Bind(runtimeSettings);
 
-            DirectoryInfo dataProtectionFolder = new DirectoryInfo(Path.Combine(runtimeSettings.DataFolder, "DataProtection"));
+            var dataProtectionFolder = new DirectoryInfo(Path.Combine(runtimeSettings.DataFolder, "DataProtection"));
 
             services.AddDataProtection()
                         .PersistKeysToFileSystem(dataProtectionFolder)
@@ -102,7 +102,7 @@ namespace Jackett.Server
             builder.RegisterType<ServiceConfigService>().As<IServiceConfigService>().SingleInstance();
             builder.RegisterType<FilePermissionService>().As<IFilePermissionService>().SingleInstance();
 
-            IContainer container = builder.Build();
+            var container = builder.Build();
             Helper.ApplicationContainer = container;
 
             Helper.Logger.Debug("Autofac container built");
@@ -124,7 +124,7 @@ namespace Jackett.Server
 
             app.UseCustomExceptionHandler();
 
-            string serverBasePath = Helper.ServerService.BasePath() ?? string.Empty;
+            var serverBasePath = Helper.ServerService.BasePath() ?? string.Empty;
 
             if (!string.IsNullOrEmpty(serverBasePath))
             {
@@ -163,7 +163,7 @@ namespace Jackett.Server
 
             app.UseCustomExceptionHandler();
 
-            string serverBasePath = Helper.ServerService.BasePath() ?? string.Empty;
+            var serverBasePath = Helper.ServerService.BasePath() ?? string.Empty;
 
             if (!string.IsNullOrEmpty(serverBasePath))
             {
diff --git a/src/Jackett.Service/Program.cs b/src/Jackett.Service/Program.cs
index fa6f91492..06829c609 100644
--- a/src/Jackett.Service/Program.cs
+++ b/src/Jackett.Service/Program.cs
@@ -2,12 +2,12 @@
 
 namespace Jackett.Service
 {
-    static class Program
+    internal static class Program
     {
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
-        static void Main()
+        private static void Main()
         {
             ServiceBase[] ServicesToRun;
             ServicesToRun = new ServiceBase[]
diff --git a/src/Jackett.Service/Service.cs b/src/Jackett.Service/Service.cs
index 6c27c6e97..81e87950f 100644
--- a/src/Jackett.Service/Service.cs
+++ b/src/Jackett.Service/Service.cs
@@ -13,16 +13,16 @@ namespace Jackett.Service
 {
     public partial class Service : ServiceBase
     {
-        private IProcessService processService;
+        private readonly IProcessService processService;
         private Process consoleProcess;
-        private Logger logger;
+        private readonly Logger logger;
         private bool serviceStopInitiated;
 
         public Service()
         {
             InitializeComponent();
 
-            RuntimeSettings runtimeSettings = new RuntimeSettings()
+            var runtimeSettings = new RuntimeSettings()
             {
                 CustomLogFileName = "ServiceLog.txt"
             };
@@ -51,7 +51,7 @@ namespace Jackett.Service
 
         private void StartConsoleApplication()
         {
-            string applicationFolder = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
+            var applicationFolder = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
 
             var exePath = Path.Combine(applicationFolder, "JackettConsole.exe");
 
diff --git a/src/Jackett.Test/Services/ProtectionServiceTests.cs b/src/Jackett.Test/Services/ProtectionServiceTests.cs
index 877af4b48..d1a6bce1c 100644
--- a/src/Jackett.Test/Services/ProtectionServiceTests.cs
+++ b/src/Jackett.Test/Services/ProtectionServiceTests.cs
@@ -6,7 +6,7 @@ using NUnit.Framework;
 namespace Jackett.Test.Services
 {
     [TestFixture]
-    class ProtectionServiceTests : TestBase
+    internal class ProtectionServiceTests : TestBase
     {
 
         [Test]
diff --git a/src/Jackett.Test/TestBase.cs b/src/Jackett.Test/TestBase.cs
index 717d6abed..d73bda8f0 100644
--- a/src/Jackett.Test/TestBase.cs
+++ b/src/Jackett.Test/TestBase.cs
@@ -2,7 +2,7 @@
 
 namespace Jackett.Test
 {
-    abstract class TestBase
+    internal abstract class TestBase
     {
         [SetUp]
         public void Setup()
diff --git a/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs b/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs
index 9f601795f..6d95609a2 100644
--- a/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs
+++ b/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs
@@ -7,7 +7,7 @@ using Newtonsoft.Json.Linq;
 
 namespace Jackett.Test
 {
-    class TestIndexerManagerServiceHelper : IIndexerManagerService
+    internal class TestIndexerManagerServiceHelper : IIndexerManagerService
     {
         public JToken LastSavedConfig { get; set; }
 
diff --git a/src/Jackett.Test/TestUtil.cs b/src/Jackett.Test/TestUtil.cs
index 0050810d1..68cb6007b 100644
--- a/src/Jackett.Test/TestUtil.cs
+++ b/src/Jackett.Test/TestUtil.cs
@@ -11,7 +11,7 @@ using NLog;
 
 namespace Jackett.Test
 {
-    static class TestUtil
+    internal static class TestUtil
     {
         private static IContainer testContainer;
 
@@ -59,9 +59,9 @@ namespace Jackett.Test
             var assembly = Assembly.GetExecutingAssembly();
             var resourceName = "Jackett.Test." + item.Replace('/', '.');
 
-            using (Stream stream = assembly.GetManifestResourceStream(resourceName))
+            using (var stream = assembly.GetManifestResourceStream(resourceName))
             {
-                using (StreamReader reader = new StreamReader(stream))
+                using (var reader = new StreamReader(stream))
                 {
                     return reader.ReadToEnd();
                 }
diff --git a/src/Jackett.Test/TestWebClient.cs b/src/Jackett.Test/TestWebClient.cs
index 7b41d07d4..8dc58d240 100644
--- a/src/Jackett.Test/TestWebClient.cs
+++ b/src/Jackett.Test/TestWebClient.cs
@@ -11,8 +11,8 @@ namespace Jackett.Test
 {
     public class TestWebClient : WebClient
     {
-        private Dictionary<WebRequest, Func<WebRequest, WebClientByteResult>> byteCallbacks = new Dictionary<WebRequest, Func<WebRequest, WebClientByteResult>>();
-        private Dictionary<WebRequest, Func<WebRequest, WebClientStringResult>> stringCallbacks = new Dictionary<WebRequest, Func<WebRequest, WebClientStringResult>>();
+        private readonly Dictionary<WebRequest, Func<WebRequest, WebClientByteResult>> byteCallbacks = new Dictionary<WebRequest, Func<WebRequest, WebClientByteResult>>();
+        private readonly Dictionary<WebRequest, Func<WebRequest, WebClientStringResult>> stringCallbacks = new Dictionary<WebRequest, Func<WebRequest, WebClientStringResult>>();
 
         public TestWebClient(IProcessService p, Logger l, IConfigurationService c, ServerConfig sc)
             : base(p: p,
@@ -32,17 +32,17 @@ namespace Jackett.Test
             stringCallbacks.Add(req, f);
         }
 
-        override public Task<WebClientByteResult> GetBytes(WebRequest request)
+        public override Task<WebClientByteResult> GetBytes(WebRequest request)
         {
             return Task.FromResult<WebClientByteResult>(byteCallbacks.Where(r => r.Key.Equals(request)).First().Value.Invoke(request));
         }
 
-        override public Task<WebClientStringResult> GetString(WebRequest request)
+        public override Task<WebClientStringResult> GetString(WebRequest request)
         {
             return Task.FromResult<WebClientStringResult>(stringCallbacks.Where(r => r.Key.Equals(request)).First().Value.Invoke(request));
         }
 
-        override public void Init()
+        public override void Init()
         {
 
         }
diff --git a/src/Jackett.Test/Util/ServerUtilTests.cs b/src/Jackett.Test/Util/ServerUtilTests.cs
index 44d179ddb..3335d7255 100644
--- a/src/Jackett.Test/Util/ServerUtilTests.cs
+++ b/src/Jackett.Test/Util/ServerUtilTests.cs
@@ -5,7 +5,7 @@ using NUnit.Framework;
 namespace Jackett.Test.Util
 {
     [TestFixture]
-    class ServerUtilTests : TestBase
+    internal class ServerUtilTests : TestBase
     {
         [Test]
         public void ResureRedirectIsFullyQualified_makes_redicts_fully_qualified()
diff --git a/src/Jackett.Tray/Main.cs b/src/Jackett.Tray/Main.cs
index 90addf7fc..aa3c0008f 100644
--- a/src/Jackett.Tray/Main.cs
+++ b/src/Jackett.Tray/Main.cs
@@ -15,14 +15,14 @@ namespace Jackett.Tray
 {
     public partial class Main : Form
     {
-        private IProcessService processService;
-        private IServiceConfigService windowsService;
-        private ITrayLockService trayLockService;
-        private ISerializeService serializeService;
-        private IConfigurationService configurationService;
-        private ServerConfig serverConfig;
+        private readonly IProcessService processService;
+        private readonly IServiceConfigService windowsService;
+        private readonly ITrayLockService trayLockService;
+        private readonly ISerializeService serializeService;
+        private readonly IConfigurationService configurationService;
+        private readonly ServerConfig serverConfig;
         private Process consoleProcess;
-        private Logger logger;
+        private readonly Logger logger;
         private bool closeApplicationInitiated;
 
         public Main(string updatedVersion)
@@ -35,7 +35,7 @@ namespace Jackett.Tray
             WindowState = FormWindowState.Minimized;
             FormBorderStyle = FormBorderStyle.FixedToolWindow;
 
-            RuntimeSettings runtimeSettings = new RuntimeSettings()
+            var runtimeSettings = new RuntimeSettings()
             {
                 CustomLogFileName = "TrayLog.txt"
             };
@@ -94,7 +94,7 @@ namespace Jackett.Tray
                 //We won't be able to start the tray app up again from the updater, as when running via a windows service there is no interaction with the desktop
                 //Fire off a console process that will start the tray 20 seconds later
 
-                string trayExePath = Assembly.GetEntryAssembly().Location;
+                var trayExePath = Assembly.GetEntryAssembly().Location;
 
                 var startInfo = new ProcessStartInfo()
                 {
@@ -114,7 +114,7 @@ namespace Jackett.Tray
 
         private void toolStripMenuItemWebUI_Click(object sender, EventArgs e)
         {
-            ProcessStartInfo psi = new ProcessStartInfo
+            var psi = new ProcessStartInfo
             {
                 FileName = "http://127.0.0.1:" + serverConfig.Port,
                 UseShellExecute = true
@@ -172,13 +172,13 @@ namespace Jackett.Tray
         {
             if (Environment.OSVersion.Platform == PlatformID.Win32NT)
             {
-                using (StreamWriter writer = new StreamWriter(ShortcutPath))
+                using (var writer = new StreamWriter(ShortcutPath))
                 {
                     var appPath = Process.GetCurrentProcess().MainModule.FileName;
                     writer.WriteLine("[InternetShortcut]");
                     writer.WriteLine("URL=file:///" + appPath);
                     writer.WriteLine("IconIndex=0");
-                    string icon = appPath.Replace('\\', '/');
+                    var icon = appPath.Replace('\\', '/');
                     writer.WriteLine("IconFile=" + icon);
                 }
             }
@@ -286,7 +286,7 @@ namespace Jackett.Tray
 
         private void StartConsoleApplication()
         {
-            string applicationFolder = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
+            var applicationFolder = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
 
             var exePath = Path.Combine(applicationFolder, "JackettConsole.exe");
 
diff --git a/src/Jackett.Tray/Program.cs b/src/Jackett.Tray/Program.cs
index ece4358c7..fa05e6a2b 100644
--- a/src/Jackett.Tray/Program.cs
+++ b/src/Jackett.Tray/Program.cs
@@ -6,13 +6,13 @@ using CommandLine;
 
 namespace Jackett.Tray
 {
-    static class Program
+    internal static class Program
     {
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
             var JacketTrayProcess = Process.GetCurrentProcess();
             var runningProcesses = Process.GetProcesses();
@@ -25,7 +25,7 @@ namespace Jackett.Tray
             }
             else
             {
-                string newVersion = "";
+                var newVersion = "";
                 var commandLineParser = new Parser(settings => settings.CaseSensitive = false);
 
                 try
diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs
index 49189e5b6..8ce4f87b2 100644
--- a/src/Jackett.Updater/Program.cs
+++ b/src/Jackett.Updater/Program.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -29,7 +28,7 @@ namespace Jackett.Updater
 
         private void Run(string[] args)
         {
-            RuntimeSettings runtimeSettings = new RuntimeSettings()
+            var runtimeSettings = new RuntimeSettings()
             {
                 CustomLogFileName = "updater.txt"
             };
@@ -40,11 +39,11 @@ namespace Jackett.Updater
             logger.Info("Jackett Updater v" + GetCurrentVersion());
             logger.Info("Options \"" + string.Join("\" \"", args) + "\"");
 
-            Variants variants = new Variants();
+            var variants = new Variants();
             variant = variants.GetVariant();
             logger.Info("Jackett variant: " + variant.ToString());
 
-            bool isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
+            var isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
             if (isWindows)
             {
                 //The updater starts before Jackett closes
@@ -176,7 +175,7 @@ namespace Jackett.Updater
                 KillPids(pids);
             }
 
-            Variants variants = new Variants();
+            var variants = new Variants();
             if (variants.IsNonWindowsDotNetCoreVariant(variant))
             {
                 // On Linux you can't modify an executable while it is executing
@@ -185,12 +184,12 @@ namespace Jackett.Updater
                 // Delete the ./jackett executable
                 // pdb files are also problematic https://github.com/Jackett/Jackett/issues/5167#issuecomment-489301150
 
-                string jackettExecutable = options.Path.TrimEnd('/') + "/jackett";
-                List<string> pdbFiles = Directory.EnumerateFiles(options.Path, "*.pdb", SearchOption.AllDirectories).ToList();
-                List<string> removeList = pdbFiles;
+                var jackettExecutable = options.Path.TrimEnd('/') + "/jackett";
+                var pdbFiles = Directory.EnumerateFiles(options.Path, "*.pdb", SearchOption.AllDirectories).ToList();
+                var removeList = pdbFiles;
                 removeList.Add(jackettExecutable);
 
-                foreach (string fileForDelete in removeList)
+                foreach (var fileForDelete in removeList)
                 {
                     try
                     {
@@ -228,7 +227,7 @@ namespace Jackett.Updater
                         continue;
                     }
 
-                    bool fileCopySuccess = CopyUpdateFile(options.Path, file, updateLocation, false);
+                    var fileCopySuccess = CopyUpdateFile(options.Path, file, updateLocation, false);
 
                     if (!fileCopySuccess)
                     {
@@ -245,7 +244,7 @@ namespace Jackett.Updater
             logger.Info("File copying complete");
 
             // delete old dirs
-            string[] oldDirs = new string[] { "Content/logos" };
+            var oldDirs = new string[] { "Content/logos" };
 
             foreach (var oldDir in oldDirs)
             {
@@ -265,7 +264,7 @@ namespace Jackett.Updater
             }
 
             // delete old files
-            string[] oldFiles = new string[] {
+            var oldFiles = new string[] {
                 "appsettings.Development.json",
                 "Autofac.Integration.WebApi.dll",
                 "Content/congruent_outline.png",
@@ -491,7 +490,7 @@ namespace Jackett.Updater
 
         private bool CopyUpdateFile(string jackettDestinationDirectory, string fullSourceFilePath, string updateSourceDirectory, bool previousAttemptFailed)
         {
-            bool success = false;
+            var success = false;
 
             string fileName;
             string fullDestinationFilePath;
@@ -567,7 +566,7 @@ namespace Jackett.Updater
 
         private string GetJackettConsolePath(string directoryPath)
         {
-            Variants variants = new Variants();
+            var variants = new Variants();
             if (variants.IsNonWindowsDotNetCoreVariant(variant))
             {
                 return Path.Combine(directoryPath, "jackett");