diff --git a/src/Discord.Net/DiscordClient.API.cs b/src/Discord.Net/DiscordClient.API.cs
index 7aa04e29f..a4a100614 100644
--- a/src/Discord.Net/DiscordClient.API.cs
+++ b/src/Discord.Net/DiscordClient.API.cs
@@ -16,8 +16,6 @@ namespace Discord
 
 	public partial class DiscordClient
 	{
-		//TODO: Move all these functions into their respective collections object
-
 		//Servers
 		/// <summary> Creates a new server with the provided name and region (see Regions). </summary>
 		public async Task<Server> CreateServer(string name, string region)
diff --git a/src/Discord.Net/Net/WebSockets/WebSocket.BuiltIn.cs b/src/Discord.Net/Net/WebSockets/WebSocket.BuiltIn.cs
index 8777fe609..f084d7177 100644
--- a/src/Discord.Net/Net/WebSockets/WebSocket.BuiltIn.cs
+++ b/src/Discord.Net/Net/WebSockets/WebSocket.BuiltIn.cs
@@ -85,7 +85,7 @@ namespace Discord.Net.WebSockets
 							}
 
 							if (result.MessageType == WebSocketMessageType.Close)
-								throw new Exception($"Got Close Message ({result.CloseStatus?.ToString() ?? "Unexpected"}, {result.CloseStatusDescription ?? "No Reason"})");
+								throw new Exception($"Got Close Message ({result.CloseStatus?.ToString() ?? "Unexpected"}): {result.CloseStatusDescription ?? "No Reason"}");
 							else
 								builder.Append(Encoding.UTF8.GetString(buffer.Array, buffer.Offset, result.Count));