diff --git a/src/inc/trigger/coins.js b/src/inc/trigger/coins.js
index 5d095e2..a1038f1 100644
--- a/src/inc/trigger/coins.js
+++ b/src/inc/trigger/coins.js
@@ -18,8 +18,7 @@ module.exports = bot => {
   bot._trigger.set("coins", new bot.trigger({
     call: /^(\.|\/)(btc|eth|xmr)/i,
     f: e => {
-      let args = e.message.trim().substr(1).toLowerCase().split(" ");
-      cryptowat_summary(args[0], markets[args[0]], args[0] !== "xmr" ? args[1] : "usd").then(
+      cryptowat_summary(e.cmd, markets[e.cmd], e.cmd !== "xmr" ? e.args[0] || "usd" : "usd").then(
         resolve => e.reply(resolve),
         reject => e.reply(reject)
       );
@@ -47,7 +46,6 @@ const cryptowat_summary = (crypto, market, currency) => {
           change: (result.price.change.percentage * 100).toFixed(2),
           volume: result.volume
         };
-
         resolve(`Current: [b]${data.last}[/b] - High: [b]${data.high}[/b] - Low: [b]${data.low}[/b] - Change: [b]${data.change}[/b]% - Volume: [b]${data.volume}[/b]`);
       });
     });
diff --git a/src/inc/trigger/core.js b/src/inc/trigger/core.js
index 4de1629..599f10e 100644
--- a/src/inc/trigger/core.js
+++ b/src/inc/trigger/core.js
@@ -7,8 +7,7 @@ module.exports = bot => {
     level: 100,
     clients: ["irc"],
     f: e => {
-      let args = e.message.trim().substring(6).split(" ");
-      let chans = args.filter(chan => chan.charAt(0) === "#");
+      const chans = e.args.filter(chan => chan.charAt(0) === "#");
       chans.map(e.join);
       e.reply(`joined channel${chans.length > 1 ? "s" : null}: ${chans.join(", ")}`);
     }
@@ -19,8 +18,7 @@ module.exports = bot => {
     level: 100,
     clients: ["irc"],
     f: e => {
-      let args = e.message.trim().substring(6).split(" ");
-      let chans = args.filter(chan => chan.charAt(0) === "#");
+      const chans = e.args.filter(chan => chan.charAt(0) === "#");
       chans.map(e.part);
       e.reply(`parted channel${chans.length > 1 ? "s" : null}: ${chans.join(", ")}`);
     }
@@ -31,11 +29,10 @@ module.exports = bot => {
     level: 100,
     clients: ["irc"],
     f: e => {
-      let args = e.message.trim().substring(6).split(" ");
-      e.write(`NICK ${args[0]}`);
+      e.write(`NICK ${e.args[0]}`);
       e._user.deli(e.self.me.nickname);
-      e.whois(args[0]);
-      e.reply(`changed nick to ${args[0]}`);
+      e.whois(e.args[0]);
+      e.reply(`changed nick to ${e.args[0]}`);
     }
   }));