diff --git a/src/NadekoBot/Modules/CustomReactions/Extensions/Extensions.cs b/src/NadekoBot/Modules/CustomReactions/Extensions/Extensions.cs
index 79591b7c..f24effb1 100644
--- a/src/NadekoBot/Modules/CustomReactions/Extensions/Extensions.cs
+++ b/src/NadekoBot/Modules/CustomReactions/Extensions/Extensions.cs
@@ -74,7 +74,7 @@ namespace NadekoBot.Modules.CustomReactions.Extensions
 
             var rep = new ReplacementBuilder()
                 .WithDefault(ctx.Author, ctx.Channel, (ctx.Channel as ITextChannel)?.Guild, client)
-                .WithOverride("%target%", () => ctx.Content.Substring(substringIndex))
+                .WithOverride("%target%", () => ctx.Content.Substring(substringIndex).Trim())
                 .Build();
 
             str = rep.Replace(str);
diff --git a/src/NadekoBot/Modules/Games/Common/Connect4/Connect4.cs b/src/NadekoBot/Modules/Games/Common/Connect4/Connect4.cs
index 0ba9acb8..ae475e5e 100644
--- a/src/NadekoBot/Modules/Games/Common/Connect4/Connect4.cs
+++ b/src/NadekoBot/Modules/Games/Common/Connect4/Connect4.cs
@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Games.Common.Connect4
 {
-    //todo: diagonal checking
     public class Connect4Game : IDisposable
     {
         public enum Phase