diff --git a/commands/admin/ban.js b/commands/admin/ban.js
index d766ce4..92bb654 100644
--- a/commands/admin/ban.js
+++ b/commands/admin/ban.js
@@ -20,9 +20,8 @@ module.exports = class BanCommand extends Command {
     }
 
     async run(message, { member }) {
-        if(member.id === message.author.id) {
-            message.say("Why would you ban yourself ?")
-        } else
+        if(member.id === message.author.id)
+            return message.say("Why would you ban yourself ?")
         member.ban()
             .then(() => message.reply(`${member.user.username} was succesfully banned.`));
         };
diff --git a/commands/admin/kick.js b/commands/admin/kick.js
index feefdb9..c0e0702 100644
--- a/commands/admin/kick.js
+++ b/commands/admin/kick.js
@@ -20,9 +20,8 @@ module.exports = class KickCommand extends Command {
     }
 
     async run(message, { member }) {
-        if(member.id === message.author.id) {
-            message.say("Why would you kick yourself ?")
-        } else
+        if(member.id === message.author.id)
+            return message.say("Why would you kick yourself ?")
         member.kick()
         .then(() => message.reply(`${member.user.username} was succesfully kicked.`));
         };
diff --git a/commands/fun/emotesay.js b/commands/fun/emotesay.js
index c6ef4d2..efaf54d 100644
--- a/commands/fun/emotesay.js
+++ b/commands/fun/emotesay.js
@@ -21,9 +21,8 @@ module.exports = class emoteSayCommand extends Command {
         message.delete();
         text.toLowerCase().split('')
         let emojiArray = [];
-        for (let i = 0; i < text.length; i++) {
+        for (let i = 0; i < text.length; i++)
             emojiArray[i] = emojiCharacters[text[i]];
-        }
         message.say(emojiArray.join(""))
         
 
diff --git a/commands/fun/randocat.js b/commands/fun/randocat.js
index 0e8f9d5..41f8ce9 100644
--- a/commands/fun/randocat.js
+++ b/commands/fun/randocat.js
@@ -13,9 +13,6 @@ module.exports = class RandoCatCommand extends Command {
 
     async run(message, { city }) {
         const { body } = await snekfetch.get(`http://aws.random.cat/meow`);
-        if (body.cod == '404') {
-            return message.say(`No results found for **${city}**`);
-        }
         const dogEmbed = new Discord.RichEmbed()
         .setColor("#ff9900")
         .setTitle('Meow')
diff --git a/commands/fun/randodog.js b/commands/fun/randodog.js
index b97fd88..ea570fb 100644
--- a/commands/fun/randodog.js
+++ b/commands/fun/randodog.js
@@ -13,9 +13,6 @@ module.exports = class RandoDogCommand extends Command {
 
     async run(message, { city }) {
         const { body } = await snekfetch.get(`https://random.dog/woof.json`);
-        if (body.cod == '404') {
-            return message.say(`No results found for **${city}**`);
-        }
         const dogEmbed = new Discord.RichEmbed()
         .setColor("#ff9900")
         .setTitle('Woof')
diff --git a/commands/utility/avatar.js b/commands/utility/avatar.js
index b207203..8c261ef 100644
--- a/commands/utility/avatar.js
+++ b/commands/utility/avatar.js
@@ -10,9 +10,8 @@ module.exports = class AvatarCommand extends Command {
     }
 
     async run(message) {
-        if (!message.mentions.users.size) {
+        if (!message.mentions.users.size)
             return message.channel.send(`Your avatar: ${message.author.displayAvatarURL}`);
-        }
 
         const avatarList = message.mentions.users.map(user => {
             return `${user.username}'s avatar: ${user.displayAvatarURL}`;