diff --git a/lib/Structures/Message.js b/lib/Structures/Message.js
index 62eb341e4..a76ed019f 100644
--- a/lib/Structures/Message.js
+++ b/lib/Structures/Message.js
@@ -57,17 +57,13 @@ var Message = (function (_Equality) {
 			// this is .add and not .get because it allows the bot to cache
 			// users from messages from logs who may have left the server and were
 			// not previously cached.
-			if (mention instanceof _User2["default"]) _this.mentions.push(mention);else _this.mentions.add(client.internal.users.add(new _User2["default"](mention, client)));
+			if (mention instanceof _User2["default"]) _this.mentions.add(mention);else _this.mentions.add(client.internal.users.add(new _User2["default"](mention, client)));
 		});
 	}
 
 	Message.prototype.isMentioned = function isMentioned(user) {
 		user = this.client.internal.resolver.resolveUser(user);
-		if (user) {
-			return this.mentions.has(user);
-		} else {
-			return false;
-		}
+		return !!(user && this.mentions.has(user));
 	};
 
 	Message.prototype.toString = function toString() {
diff --git a/src/Structures/Message.js b/src/Structures/Message.js
index 972cdcf19..36aedd372 100644
--- a/src/Structures/Message.js
+++ b/src/Structures/Message.js
@@ -37,7 +37,7 @@ export default class Message extends Equality{
 			// users from messages from logs who may have left the server and were
 			// not previously cached.
 			if(mention instanceof User)
-				this.mentions.push(mention);
+				this.mentions.add(mention);
 			else
 				this.mentions.add(client.internal.users.add(new User(mention, client)));
 		});
@@ -49,11 +49,7 @@ export default class Message extends Equality{
 
 	isMentioned(user){
 		user = this.client.internal.resolver.resolveUser(user);
-		if (user) {
-			return this.mentions.has(user);
-		} else {
-			return false;
-		}
+		return !!(user && this.mentions.has(user));
 	}
 
 	toString(){