diff --git a/NadekoBot/Classes/Music/Song.cs b/NadekoBot/Classes/Music/Song.cs
index a8ac1845..1b2bb748 100644
--- a/NadekoBot/Classes/Music/Song.cs
+++ b/NadekoBot/Classes/Music/Song.cs
@@ -167,20 +167,10 @@ namespace NadekoBot.Classes.Music {
                     Console.WriteLine($"Buffering done." + $" [{songBuffer.ContentLength}]");
                     if (p != null) {
                         try {
-                            p.CancelOutputRead();
-                        } catch { }
-                        try {
-                            p.StandardOutput.Dispose();
-                        } catch { }
-                        try {
-                            p.CloseMainWindow();
-                        } catch { }
-                        try {
-                            p.Close();
-                        } catch { }
-                        try {
-                            p.Dispose();
-                        } catch { }
+                            p.Kill();
+                        }
+                        catch {}
+                        p.Dispose();
                     }
                 }
             });
@@ -326,7 +316,7 @@ namespace NadekoBot.Classes.Music {
             }
             if (query.Contains(".m3u")) {
                 /* 
-                    # This is a comment
+# This is a comment
                    C:\xxx4xx\xxxxxx3x\xx2xxxx\xx.mp3
                    C:\xxx5xx\x6xxxxxx\x7xxxxx\xx.mp3
                 */
diff --git a/NadekoBot/Modules/Music.cs b/NadekoBot/Modules/Music.cs
index 1305a52b..9ad8957e 100644
--- a/NadekoBot/Modules/Music.cs
+++ b/NadekoBot/Modules/Music.cs
@@ -102,12 +102,12 @@ namespace NadekoBot.Modules {
                             await e.Channel.SendMessage("🎵 No active music musicPlayer.");
                             return;
                         }
-                        string toSend = "🎵 **" + musicPlayer.Playlist.Count + "** `tracks currently queued.` ";
+                        var toSend = "🎵 **" + musicPlayer.Playlist.Count + "** `tracks currently queued.` ";
                         if (musicPlayer.Playlist.Count >= MusicPlayer.MaximumPlaylistSize)
                             toSend += "**Song queue is full!**\n";
                         else
                             toSend += "\n";
-                        int number = 1;
+                        var number = 1;
                         await e.Channel.SendMessage(toSend + string.Join("\n", musicPlayer.Playlist.Take(15).Select(v => $"`{number++}.` {v.PrettyName}")));
                     });