diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
index 091a104..1647df8 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
@@ -3,7 +3,6 @@ package com.bbn.hadder.commands.moderation;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java
index 0b85d18..3b74e25 100644
--- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java
@@ -7,7 +7,6 @@ package com.bbn.hadder.commands.nsfw;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.EmbedBuilder;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java
index 774c380..acb2da9 100644
--- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java
@@ -7,7 +7,6 @@ package com.bbn.hadder.commands.nsfw;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.EmbedBuilder;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java
index b0d4bc9..82df7a8 100644
--- a/src/main/java/com/bbn/hadder/listener/CommandListener.java
+++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java
@@ -22,14 +22,12 @@ public class CommandListener extends ListenerAdapter {
 
     @Override
     public void onMessageReceived(MessageReceivedEvent event) {
-        if (event.isFromType(ChannelType.TEXT)) {
-            if (!event.getAuthor().isBot()) {
-                String[] prefixes = {rethink.getUserPrefix(event.getAuthor().getId()), rethink.getGuildPrefix(event.getGuild().getId()), event.getGuild().getSelfMember().getAsMention()+" ", event.getGuild().getSelfMember().getAsMention()};
-                for (String prefix : prefixes) {
-                    if (event.getMessage().getContentRaw().startsWith(prefix)) {
-                        handler.handle(event, rethink, prefix);
-                        return;
-                    }
+        if (event.isFromType(ChannelType.TEXT) && !event.getAuthor().isBot()) {
+            String[] prefixes = {rethink.getUserPrefix(event.getAuthor().getId()), rethink.getGuildPrefix(event.getGuild().getId()), event.getGuild().getSelfMember().getAsMention() + " ", event.getGuild().getSelfMember().getAsMention()};
+            for (String prefix : prefixes) {
+                if (event.getMessage().getContentRaw().startsWith(prefix)) {
+                    handler.handle(event, rethink, prefix);
+                    return;
                 }
             }
         }
diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java
index 39b64d2..3d46a3d 100644
--- a/src/main/java/com/bbn/hadder/listener/MentionListener.java
+++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java
@@ -2,7 +2,6 @@ package com.bbn.hadder.listener;
 
 import com.bbn.hadder.Rethink;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -19,17 +18,15 @@ public class MentionListener extends ListenerAdapter {
 
     @Override
     public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
-        if (event.isFromType(ChannelType.TEXT)) {
-            if (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())) {
-                event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                        .setTitle("Hello I'm Hadder.")
-                        .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl())
-                        .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false)
-                        .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false)
-                        .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false)
-                        .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false)
-                        .build()).queue();
-            }
+        if (event.isFromType(ChannelType.TEXT) && event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())) {
+            event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
+                    .setTitle("Hello I'm Hadder.")
+                    .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl())
+                    .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false)
+                    .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false)
+                    .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false)
+                    .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false)
+                    .build()).queue();
         }
     }
 }
diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
index da43ef8..f0b4b40 100644
--- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
+++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
@@ -5,7 +5,6 @@ package com.bbn.hadder.listener;
  */
 
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.entities.PrivateChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java
index 5c225e6..7b35d9b 100644
--- a/src/main/java/com/bbn/hadder/listener/RulesListener.java
+++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java
@@ -23,11 +23,9 @@ public class RulesListener extends ListenerAdapter {
             if (!event.getMember().getUser().isBot()) {
                 if (event.getReactionEmote().getEmoji().equals("✅")) {
                     event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
-                } else if (event.getReactionEmote().getEmoji().equals("❌")) {
-                    if (event.getGuild().getSelfMember().canInteract(event.getMember())) {
-                        event.getReaction().removeReaction().queue();
-                        event.getMember().kick().reason("Declined the rules");
-                    }
+                } else if (event.getReactionEmote().getEmoji().equals("❌") && event.getGuild().getSelfMember().canInteract(event.getMember())) {
+                    event.getReaction().removeReaction().queue();
+                    event.getMember().kick().reason("Declined the rules");
                 }
             }
         }
@@ -36,10 +34,8 @@ public class RulesListener extends ListenerAdapter {
     @Override
     public void onMessageReactionRemove(MessageReactionRemoveEvent event) {
         if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId()))) {
-            if (!event.getMember().getUser().isBot()) {
-                if (event.getReactionEmote().getEmoji().equals("✅")) {
-                    event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue();
-                }
+            if (!event.getMember().getUser().isBot() && event.getReactionEmote().getEmoji().equals("✅")) {
+                event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue();
             }
         }
     }