Code Cleanup

Author: Jonas Dellinger

SpotifyAPI/Local/RemoteHandler.cs

@@ -26,7 +26,7 @@ public RemoteHandler(SpotifyLocalAPIConfig config)
             _config = config;
         }
 
-        internal Boolean Init()
+        internal bool Init()
         {
             OauthKey = GetOAuthKey();
             CfidKey = GetCfid();
@@ -35,30 +35,36 @@ internal Boolean Init()
 
         internal async Task SendPauseRequest()
         {
-            var @params = new NameValueCollection() { { "pause", "true" } };
+            NameValueCollection @params = new NameValueCollection { { "pause", "true" } };
             await QueryAsync("remote/pause.json", true, true, -1, @params).ConfigureAwait(false);
         }
 
         internal async Task SendPlayRequest()
         {
-            var @params = new NameValueCollection() { { "pause", "false" } };
+            NameValueCollection @params = new NameValueCollection { { "pause", "false" } };
             await QueryAsync("remote/pause.json", true, true, -1, @params).ConfigureAwait(false);
         }
 
         internal async Task SendPlayRequest(string url, string context = "")
         {
 
             // TODO: instead of having an empty context, one way to fix the bug with the playback time beyond the length of a song would be to provide a 1-song context, and it would be fixed.
-            var @params = new NameValueCollection() { {"uri", url },
-                { "context", context} };
+            NameValueCollection @params = new NameValueCollection
+            {
+                {"uri", url},
+                {"context", context}
+            };
             await QueryAsync($"remote/play.json", true, true, -1, @params).ConfigureAwait(false);
 
         }
 
         internal async Task SendQueueRequest(string url)
         {
-            var @params = new NameValueCollection() { {"uri", url },
-                { "action", "queue"} };
+            NameValueCollection @params = new NameValueCollection
+            {
+                {"uri", url},
+                {"action", "queue"}
+            };
             await QueryAsync("remote/play.json", true, true, -1, @params).ConfigureAwait(false);
 
         }
@@ -67,9 +73,7 @@ internal StatusResponse GetNewStatus()
         {
             string response = Query("remote/status.json", true, true, -1);
             if (string.IsNullOrEmpty(response))
-            {
                 return null;
-            }
             response = response.Replace("\\n", "");
             List<StatusResponse> raw = JsonConvert.DeserializeObject<List<StatusResponse>>(response);
             return raw[0];
@@ -104,7 +108,7 @@ internal string BuildQueryString(bool oauth, bool cfid, int wait, NameValueColle
             {
                 @params = new NameValueCollection();
             }
-            var queryParameter = HttpUtility.ParseQueryString(string.Empty);
+            NameValueCollection queryParameter = HttpUtility.ParseQueryString(string.Empty);
             queryParameter.Add(@params);
             queryParameter.Add(new NameValueCollection() {
                 { "ref", string.Empty},
@@ -135,7 +139,7 @@ internal string Query(string baseUrl, bool oauth, bool cfid, int wait, NameValue
             string response = string.Empty;
             try
             {
-                using (var wc = new ExtendedWebClient())
+                using (ExtendedWebClient wc = new ExtendedWebClient())
                 {
                     if (SpotifyLocalAPI.IsSpotifyRunning())
                     {
@@ -158,7 +162,7 @@ internal async Task<string> QueryAsync(string baseUrl, bool oauth, bool cfid, in
             string response = "";
             try
             {
-                using (var wc = new ExtendedWebClient())
+                using (ExtendedWebClient wc = new ExtendedWebClient())
                 {
                     if (SpotifyLocalAPI.IsSpotifyRunning())
                         response = "[ " + await wc.DownloadStringTaskAsync(new Uri(address)).ConfigureAwait(false) + " ]";
@@ -178,7 +182,7 @@ internal int GetTimestamp()
 
         internal WebClient GetWebClientWithUserAgentHeader()
         {
-            var wc = new WebClient();
+            WebClient wc = new WebClient();
 
             wc.Headers.Add(HttpRequestHeader.UserAgent, "Spotify (1.0.50.41368.gbd68dbef)");