diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 05828d82..91b2acd6 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -1505,9 +1505,9 @@ var InternalClient = (function () {
 
 						if (presenceUser.equals(user)) {
 							// a real presence update
-							client.emit("presence", user, data.status, data.game_id);
 							user.status = data.status;
 							user.gameID = data.game_id;
+							client.emit("presence", user, data.status, data.game_id);
 						} else {
 							// a name change or avatar change
 							client.emit("userUpdated", user, presenceUser);
diff --git a/lib/Util/Equality.js b/lib/Util/Equality.js
index aab16535..6c4f7caf 100644
--- a/lib/Util/Equality.js
+++ b/lib/Util/Equality.js
@@ -23,10 +23,7 @@ var Equality = (function () {
 	}
 
 	Equality.prototype.equals = function equals(object) {
-		if (object && object[this.eqDiscriminator] == this[this.eqDiscriminator]) {
-			return true;
-		}
-		return false;
+		return object && object[this.eqDiscriminator] === this[this.eqDiscriminator];
 	};
 
 	Equality.prototype.equalsStrict = function equalsStrict(object) {
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index 17db601b..594beb2b 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -1387,9 +1387,9 @@ export default class InternalClient {
 
 						if (presenceUser.equals(user)) {
 							// a real presence update
-							client.emit("presence", user, data.status, data.game_id);
 							user.status = data.status;
 							user.gameID = data.game_id;
+							client.emit("presence", user, data.status, data.game_id);
 
 						} else {
 							// a name change or avatar change