diff --git a/src/client/actions/ChannelCreate.js b/src/client/actions/ChannelCreate.js
index dc4704152..83b1aa028 100644
--- a/src/client/actions/ChannelCreate.js
+++ b/src/client/actions/ChannelCreate.js
@@ -4,9 +4,7 @@ class ChannelCreateAction extends Action {
   handle(data) {
     const client = this.client;
     const channel = client.dataManager.newChannel(data);
-    return {
-      channel,
-    };
+    return { channel };
   }
 }
 
diff --git a/src/client/actions/ChannelDelete.js b/src/client/actions/ChannelDelete.js
index 7b847efce..77732c3f2 100644
--- a/src/client/actions/ChannelDelete.js
+++ b/src/client/actions/ChannelDelete.js
@@ -18,9 +18,7 @@ class ChannelDeleteAction extends Action {
       channel = this.deleted.get(data.id) || null;
     }
 
-    return {
-      channel,
-    };
+    return { channel };
   }
 
   scheduleForDeletion(id) {
diff --git a/src/client/actions/GuildChannelsPositionUpdate.js b/src/client/actions/GuildChannelsPositionUpdate.js
index 3322eaf07..ea184eff6 100644
--- a/src/client/actions/GuildChannelsPositionUpdate.js
+++ b/src/client/actions/GuildChannelsPositionUpdate.js
@@ -12,9 +12,7 @@ class GuildChannelsPositionUpdate extends Action {
       }
     }
 
-    return {
-      guild,
-    };
+    return { guild };
   }
 }
 
diff --git a/src/client/actions/GuildDelete.js b/src/client/actions/GuildDelete.js
index 2483e2833..33da33341 100644
--- a/src/client/actions/GuildDelete.js
+++ b/src/client/actions/GuildDelete.js
@@ -36,9 +36,7 @@ class GuildDeleteAction extends Action {
       guild = this.deleted.get(data.id) || null;
     }
 
-    return {
-      guild,
-    };
+    return { guild };
   }
 
   scheduleForDeletion(id) {
diff --git a/src/client/actions/GuildEmojiCreate.js b/src/client/actions/GuildEmojiCreate.js
index 30c52ee24..ee2561e73 100644
--- a/src/client/actions/GuildEmojiCreate.js
+++ b/src/client/actions/GuildEmojiCreate.js
@@ -4,9 +4,7 @@ class GuildEmojiCreateAction extends Action {
   handle(guild, createdEmoji) {
     const client = this.client;
     const emoji = client.dataManager.newEmoji(createdEmoji, guild);
-    return {
-      emoji,
-    };
+    return { emoji };
   }
 }
 
diff --git a/src/client/actions/GuildEmojiDelete.js b/src/client/actions/GuildEmojiDelete.js
index eea5e0f4c..f17bef19f 100644
--- a/src/client/actions/GuildEmojiDelete.js
+++ b/src/client/actions/GuildEmojiDelete.js
@@ -4,9 +4,7 @@ class GuildEmojiDeleteAction extends Action {
   handle(emoji) {
     const client = this.client;
     client.dataManager.killEmoji(emoji);
-    return {
-      emoji,
-    };
+    return { emoji };
   }
 }
 
diff --git a/src/client/actions/GuildEmojiUpdate.js b/src/client/actions/GuildEmojiUpdate.js
index f129e1518..f9e3be2ae 100644
--- a/src/client/actions/GuildEmojiUpdate.js
+++ b/src/client/actions/GuildEmojiUpdate.js
@@ -3,9 +3,7 @@ const Action = require('./Action');
 class GuildEmojiUpdateAction extends Action {
   handle(oldEmoji, newEmoji) {
     const emoji = this.client.dataManager.updateEmoji(oldEmoji, newEmoji);
-    return {
-      emoji,
-    };
+    return { emoji };
   }
 }
 
diff --git a/src/client/actions/GuildMemberGet.js b/src/client/actions/GuildMemberGet.js
index b00fa0f93..ecb7a8f00 100644
--- a/src/client/actions/GuildMemberGet.js
+++ b/src/client/actions/GuildMemberGet.js
@@ -3,9 +3,7 @@ const Action = require('./Action');
 class GuildMemberGetAction extends Action {
   handle(guild, data) {
     const member = guild._addMember(data, false);
-    return {
-      member,
-    };
+    return { member };
   }
 }
 
diff --git a/src/client/actions/GuildMemberRemove.js b/src/client/actions/GuildMemberRemove.js
index d68b8b5f2..3ad5af644 100644
--- a/src/client/actions/GuildMemberRemove.js
+++ b/src/client/actions/GuildMemberRemove.js
@@ -9,10 +9,10 @@ class GuildMemberRemoveAction extends Action {
 
   handle(data) {
     const client = this.client;
-
     const guild = client.guilds.get(data.guild_id);
+    let member = null;
     if (guild) {
-      let member = guild.members.get(data.user.id);
+      member = guild.members.get(data.user.id);
       if (member) {
         guild.memberCount--;
         guild._removeMember(member);
@@ -22,17 +22,8 @@ class GuildMemberRemoveAction extends Action {
       } else {
         member = this.deleted.get(guild.id + data.user.id) || null;
       }
-
-      return {
-        guild,
-        member,
-      };
     }
-
-    return {
-      guild,
-      member: null,
-    };
+    return { guild, member };
   }
 
   scheduleForDeletion(guildID, userID) {
diff --git a/src/client/actions/GuildRoleCreate.js b/src/client/actions/GuildRoleCreate.js
index 0fa07a0fd..d3b27ea21 100644
--- a/src/client/actions/GuildRoleCreate.js
+++ b/src/client/actions/GuildRoleCreate.js
@@ -5,22 +5,15 @@ const Role = require('../../structures/Role');
 class GuildRoleCreate extends Action {
   handle(data) {
     const client = this.client;
-
     const guild = client.guilds.get(data.guild_id);
+    let role;
     if (guild) {
       const already = guild.roles.has(data.role.id);
-      const role = new Role(guild, data.role);
+      role = new Role(guild, data.role);
       guild.roles.set(role.id, role);
       if (!already) client.emit(Constants.Events.GUILD_ROLE_CREATE, role);
-
-      return {
-        role,
-      };
     }
-
-    return {
-      role: null,
-    };
+    return { role };
   }
 }
 
diff --git a/src/client/actions/GuildRoleDelete.js b/src/client/actions/GuildRoleDelete.js
index eeaa1e902..a9eada64a 100644
--- a/src/client/actions/GuildRoleDelete.js
+++ b/src/client/actions/GuildRoleDelete.js
@@ -9,10 +9,11 @@ class GuildRoleDeleteAction extends Action {
 
   handle(data) {
     const client = this.client;
-
     const guild = client.guilds.get(data.guild_id);
+    let role;
+
     if (guild) {
-      let role = guild.roles.get(data.role_id);
+      role = guild.roles.get(data.role_id);
       if (role) {
         guild.roles.delete(data.role_id);
         this.deleted.set(guild.id + data.role_id, role);
@@ -21,15 +22,9 @@ class GuildRoleDeleteAction extends Action {
       } else {
         role = this.deleted.get(guild.id + data.role_id) || null;
       }
-
-      return {
-        role,
-      };
     }
 
-    return {
-      role: null,
-    };
+    return { role };
   }
 
   scheduleForDeletion(guildID, roleID) {
diff --git a/src/client/actions/GuildRoleUpdate.js b/src/client/actions/GuildRoleUpdate.js
index 3c455e86d..8f20f2ef0 100644
--- a/src/client/actions/GuildRoleUpdate.js
+++ b/src/client/actions/GuildRoleUpdate.js
@@ -5,8 +5,8 @@ const Util = require('../../util/Util');
 class GuildRoleUpdateAction extends Action {
   handle(data) {
     const client = this.client;
-
     const guild = client.guilds.get(data.guild_id);
+    
     if (guild) {
       const roleData = data.role;
       let oldRole = null;
diff --git a/src/client/actions/GuildRolesPositionUpdate.js b/src/client/actions/GuildRolesPositionUpdate.js
index 5d1ec2338..9094965cd 100644
--- a/src/client/actions/GuildRolesPositionUpdate.js
+++ b/src/client/actions/GuildRolesPositionUpdate.js
@@ -12,9 +12,7 @@ class GuildRolesPositionUpdate extends Action {
       }
     }
 
-    return {
-      guild,
-    };
+    return { guild };
   }
 }
 
diff --git a/src/client/actions/MessageDelete.js b/src/client/actions/MessageDelete.js
index beb805097..be026d2d6 100644
--- a/src/client/actions/MessageDelete.js
+++ b/src/client/actions/MessageDelete.js
@@ -8,11 +8,11 @@ class MessageDeleteAction extends Action {
 
   handle(data) {
     const client = this.client;
-
     const channel = client.channels.get(data.channel_id);
-    if (channel) {
-      let message = channel.messages.get(data.id);
+    let message;
 
+    if (channel) {
+      message = channel.messages.get(data.id);
       if (message) {
         channel.messages.delete(message.id);
         this.deleted.set(channel.id + message.id, message);
@@ -20,15 +20,9 @@ class MessageDeleteAction extends Action {
       } else {
         message = this.deleted.get(channel.id + data.id) || null;
       }
-
-      return {
-        message,
-      };
     }
 
-    return {
-      message: null,
-    };
+    return { message };
   }
 
   scheduleForDeletion(channelID, messageID) {
diff --git a/src/client/actions/MessageDeleteBulk.js b/src/client/actions/MessageDeleteBulk.js
index 6a12ef19b..6d207c2ed 100644
--- a/src/client/actions/MessageDeleteBulk.js
+++ b/src/client/actions/MessageDeleteBulk.js
@@ -15,9 +15,7 @@ class MessageDeleteBulkAction extends Action {
     }
 
     if (messages.size > 0) client.emit(Constants.Events.MESSAGE_BULK_DELETE, messages);
-    return {
-      messages,
-    };
+    return { messages };
   }
 }
 
diff --git a/src/client/actions/MessageReactionAdd.js b/src/client/actions/MessageReactionAdd.js
index d4a83f06a..33db961cd 100644
--- a/src/client/actions/MessageReactionAdd.js
+++ b/src/client/actions/MessageReactionAdd.js
@@ -12,26 +12,18 @@ class MessageReactionAdd extends Action {
   handle(data) {
     const user = this.client.users.get(data.user_id);
     if (!user) return false;
-
+    // Verify channel
     const channel = this.client.channels.get(data.channel_id);
     if (!channel || channel.type === 'voice') return false;
-
+    // Verify message
     const message = channel.messages.get(data.message_id);
     if (!message) return false;
-
     if (!data.emoji) return false;
-
+    // Verify reaction
     const reaction = message._addReaction(data.emoji, user);
+    if (reaction) this.client.emit(Constants.Events.MESSAGE_REACTION_ADD, reaction, user);
 
-    if (reaction) {
-      this.client.emit(Constants.Events.MESSAGE_REACTION_ADD, reaction, user);
-    }
-
-    return {
-      message,
-      reaction,
-      user,
-    };
+    return { message, reaction, user };
   }
 }
 
diff --git a/src/client/actions/MessageReactionRemove.js b/src/client/actions/MessageReactionRemove.js
index c2367063c..4bea4f75c 100644
--- a/src/client/actions/MessageReactionRemove.js
+++ b/src/client/actions/MessageReactionRemove.js
@@ -12,26 +12,18 @@ class MessageReactionRemove extends Action {
   handle(data) {
     const user = this.client.users.get(data.user_id);
     if (!user) return false;
-
+    // Verify channel
     const channel = this.client.channels.get(data.channel_id);
     if (!channel || channel.type === 'voice') return false;
-
+    // Verify message
     const message = channel.messages.get(data.message_id);
     if (!message) return false;
-
     if (!data.emoji) return false;
-
+    // Verify reaction
     const reaction = message._removeReaction(data.emoji, user);
+    if (reaction) this.client.emit(Constants.Events.MESSAGE_REACTION_REMOVE, reaction, user);
 
-    if (reaction) {
-      this.client.emit(Constants.Events.MESSAGE_REACTION_REMOVE, reaction, user);
-    }
-
-    return {
-      message,
-      reaction,
-      user,
-    };
+    return { message, reaction, user };
   }
 }
 
diff --git a/src/client/actions/MessageReactionRemoveAll.js b/src/client/actions/MessageReactionRemoveAll.js
index b64185eea..24edcbd69 100644
--- a/src/client/actions/MessageReactionRemoveAll.js
+++ b/src/client/actions/MessageReactionRemoveAll.js
@@ -12,9 +12,7 @@ class MessageReactionRemoveAll extends Action {
     message._clearReactions();
     this.client.emit(Constants.Events.MESSAGE_REACTION_REMOVE_ALL, message);
 
-    return {
-      message,
-    };
+    return { message };
   }
 }
 
diff --git a/src/client/actions/UserGet.js b/src/client/actions/UserGet.js
index 65e7c9540..0ee85aee3 100644
--- a/src/client/actions/UserGet.js
+++ b/src/client/actions/UserGet.js
@@ -4,9 +4,7 @@ class UserGetAction extends Action {
   handle(data) {
     const client = this.client;
     const user = client.dataManager.newUser(data);
-    return {
-      user,
-    };
+    return { user };
   }
 }