diff --git a/lib/irc/msg.ex b/lib/irc/msg.ex
index c4f7f6c..d1762ac 100644
--- a/lib/irc/msg.ex
+++ b/lib/irc/msg.ex
@@ -49,12 +49,13 @@ defmodule Omnibot.Irc.Msg do
 
     params =
       String.slice(params, 1..-1)
-      |> String.split(" ")
+      |> String.split()
       |> Enum.filter(fn s -> String.length(s) > 0 end)
 
     trailing =
       trailing
       |> String.slice(2..-1)
+      |> String.trim()
       |> Util.string_or_nil()
 
     params = if trailing, do: params ++ [trailing], else: params