diff --git a/lib/Client.js b/lib/Client.js
index 9526b103c..cf8a79b12 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -304,33 +304,7 @@ var Client = (function () {
 								info[key] = data[key];
 							}
 
-							var mentions = [];
-							var _iteratorNormalCompletion4 = true;
-							var _didIteratorError4 = false;
-							var _iteratorError4 = undefined;
-
-							try {
-								for (var _iterator4 = data.mentions[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-									var mention = _step4.value;
-
-									mentions.push(self.addUser(mention));
-								}
-							} catch (err) {
-								_didIteratorError4 = true;
-								_iteratorError4 = err;
-							} finally {
-								try {
-									if (!_iteratorNormalCompletion4 && _iterator4["return"]) {
-										_iterator4["return"]();
-									}
-								} finally {
-									if (_didIteratorError4) {
-										throw _iteratorError4;
-									}
-								}
-							}
-
-							var newMessage = new Message(info, channel, mentions, formerMessage.author);
+							var newMessage = new Message(info, channel, data.mentions.map(self.addUser), formerMessage.author);
 
 							self.trigger("messageUpdate", newMessage, formerMessage);
 
@@ -384,16 +358,50 @@ var Client = (function () {
 	}, {
 		key: "getUser",
 		value: function getUser(key, value) {
+			var _iteratorNormalCompletion4 = true;
+			var _didIteratorError4 = false;
+			var _iteratorError4 = undefined;
+
+			try {
+				for (var _iterator4 = this.userCache[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+					var user = _step4.value;
+
+					if (user[key] === value) {
+						return user;
+					}
+				}
+			} catch (err) {
+				_didIteratorError4 = true;
+				_iteratorError4 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion4 && _iterator4["return"]) {
+						_iterator4["return"]();
+					}
+				} finally {
+					if (_didIteratorError4) {
+						throw _iteratorError4;
+					}
+				}
+			}
+
+			return null;
+		}
+
+		//def getChannel
+	}, {
+		key: "getChannel",
+		value: function getChannel(key, value) {
 			var _iteratorNormalCompletion5 = true;
 			var _didIteratorError5 = false;
 			var _iteratorError5 = undefined;
 
 			try {
-				for (var _iterator5 = this.userCache[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-					var user = _step5.value;
+				for (var _iterator5 = this.channelCache[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
+					var channel = _step5.value;
 
-					if (user[key] === value) {
-						return user;
+					if (channel[key] === value) {
+						return channel;
 					}
 				}
 			} catch (err) {
@@ -414,20 +422,22 @@ var Client = (function () {
 			return null;
 		}
 
-		//def getChannel
+		//def getServer
 	}, {
-		key: "getChannel",
-		value: function getChannel(key, value) {
+		key: "getServer",
+		value: function getServer() {
+			var key = arguments.length <= 0 || arguments[0] === undefined ? "id" : arguments[0];
+			var value = arguments.length <= 1 || arguments[1] === undefined ? "abc123" : arguments[1];
 			var _iteratorNormalCompletion6 = true;
 			var _didIteratorError6 = false;
 			var _iteratorError6 = undefined;
 
 			try {
-				for (var _iterator6 = this.channelCache[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
-					var channel = _step6.value;
+				for (var _iterator6 = this.serverCache[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
+					var server = _step6.value;
 
-					if (channel[key] === value) {
-						return channel;
+					if (server[key] === value) {
+						return server;
 					}
 				}
 			} catch (err) {
@@ -448,42 +458,6 @@ var Client = (function () {
 			return null;
 		}
 
-		//def getServer
-	}, {
-		key: "getServer",
-		value: function getServer() {
-			var key = arguments.length <= 0 || arguments[0] === undefined ? "id" : arguments[0];
-			var value = arguments.length <= 1 || arguments[1] === undefined ? "abc123" : arguments[1];
-			var _iteratorNormalCompletion7 = true;
-			var _didIteratorError7 = false;
-			var _iteratorError7 = undefined;
-
-			try {
-				for (var _iterator7 = this.serverCache[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
-					var server = _step7.value;
-
-					if (server[key] === value) {
-						return server;
-					}
-				}
-			} catch (err) {
-				_didIteratorError7 = true;
-				_iteratorError7 = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion7 && _iterator7["return"]) {
-						_iterator7["return"]();
-					}
-				} finally {
-					if (_didIteratorError7) {
-						throw _iteratorError7;
-					}
-				}
-			}
-
-			return null;
-		}
-
 		//def trySendConnData
 	}, {
 		key: "trySendConnData",
@@ -535,27 +509,27 @@ var Client = (function () {
 		get: function get() {
 
 			var msgs = [];
-			var _iteratorNormalCompletion8 = true;
-			var _didIteratorError8 = false;
-			var _iteratorError8 = undefined;
+			var _iteratorNormalCompletion7 = true;
+			var _didIteratorError7 = false;
+			var _iteratorError7 = undefined;
 
 			try {
-				for (var _iterator8 = this.channelCache[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
-					var channel = _step8.value;
+				for (var _iterator7 = this.channelCache[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
+					var channel = _step7.value;
 
 					msgs = msgs.concat(channel.messages);
 				}
 			} catch (err) {
-				_didIteratorError8 = true;
-				_iteratorError8 = err;
+				_didIteratorError7 = true;
+				_iteratorError7 = err;
 			} finally {
 				try {
-					if (!_iteratorNormalCompletion8 && _iterator8["return"]) {
-						_iterator8["return"]();
+					if (!_iteratorNormalCompletion7 && _iterator7["return"]) {
+						_iterator7["return"]();
 					}
 				} finally {
-					if (_didIteratorError8) {
-						throw _iteratorError8;
+					if (_didIteratorError7) {
+						throw _iteratorError7;
 					}
 				}
 			}
diff --git a/src/Client.js b/src/Client.js
index aa71b2758..bdf0bd733 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -247,12 +247,7 @@ class Client {
 							info[key] = data[key];
 						}
 
-						var mentions = [];
-						for (var mention of data.mentions) {
-							mentions.push(self.addUser(mention));
-						}
-
-						var newMessage = new Message(info, channel, mentions, formerMessage.author);
+						var newMessage = new Message(info, channel, data.mentions.map(self.addUser), formerMessage.author);
 						
 						self.trigger("messageUpdate", newMessage, formerMessage);