diff --git a/src/main/java/uk/co/jacekk/bukkit/bloodmoon/Config.java b/src/main/java/uk/co/jacekk/bukkit/bloodmoon/Config.java
index 77ff246..4e78aff 100644
--- a/src/main/java/uk/co/jacekk/bukkit/bloodmoon/Config.java
+++ b/src/main/java/uk/co/jacekk/bukkit/bloodmoon/Config.java
@@ -9,6 +9,8 @@
 import uk.co.jacekk.bukkit.baseplugin.config.PluginConfigKey;
 
 public class Config {
+    
+    private Config() {}
 
     public static final PluginConfigKey ENABLED = new PluginConfigKey("enabled", false);
     public static final PluginConfigKey ALWAYS_ON = new PluginConfigKey("always-on", false);
diff --git a/src/main/java/uk/co/jacekk/bukkit/bloodmoon/Permission.java b/src/main/java/uk/co/jacekk/bukkit/bloodmoon/Permission.java
index 20fb193..e5541e5 100644
--- a/src/main/java/uk/co/jacekk/bukkit/bloodmoon/Permission.java
+++ b/src/main/java/uk/co/jacekk/bukkit/bloodmoon/Permission.java
@@ -2,6 +2,8 @@
 
 public class Permission {
 
+    private Permission() {}
+    
     public static final String ADMIN_START                  = "bloodmoon.admin.start";
     public static final String ADMIN_STOP                   = "bloodmoon.admin.stop";
     public static final String ADMIN_RELOAD                 = "bloodmoon.admin.reload";
diff --git a/src/main/java/uk/co/jacekk/bukkit/bloodmoon/TimeMonitorTask.java b/src/main/java/uk/co/jacekk/bukkit/bloodmoon/TimeMonitorTask.java
index 2be2a48..9da9362 100644
--- a/src/main/java/uk/co/jacekk/bukkit/bloodmoon/TimeMonitorTask.java
+++ b/src/main/java/uk/co/jacekk/bukkit/bloodmoon/TimeMonitorTask.java
@@ -33,10 +33,8 @@ public void run() {
 
                             plugin.forceWorlds.remove(worldName);
                         }
-                    } else if (worldTime >= 23000 && worldTime <= 23100) {
-                        if (plugin.isActive(world)) {
-                            plugin.deactivate(world);
-                        }
+                    } else if (worldTime >= 23000 && worldTime <= 23100 && plugin.isActive(world)) {
+                        plugin.deactivate(world);
                     }
                 }
             }
diff --git a/src/main/java/uk/co/jacekk/bukkit/bloodmoon/feature/client/ChatMessageListener.java b/src/main/java/uk/co/jacekk/bukkit/bloodmoon/feature/client/ChatMessageListener.java
index 5fda4a4..c71b36c 100644
--- a/src/main/java/uk/co/jacekk/bukkit/bloodmoon/feature/client/ChatMessageListener.java
+++ b/src/main/java/uk/co/jacekk/bukkit/bloodmoon/feature/client/ChatMessageListener.java
@@ -48,10 +48,8 @@ public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
         if (plugin.isFeatureEnabled(world, Feature.CHAT_MESSAGE)) {
             String message = worldConfig.getString(Config.FEATURE_CHAT_MESSAGE_START_MESSAGE);
 
-            if (!message.isEmpty()) {
-                if (plugin.isActive(world)) {
-                    player.sendMessage(ChatColor.translateAlternateColorCodes('&', message));
-                }
+            if (!message.isEmpty() && plugin.isActive(world)) {
+                player.sendMessage(ChatColor.translateAlternateColorCodes('&', message));
             }
         }
     }
diff --git a/src/main/java/uk/co/jacekk/bukkit/bloodmoon/feature/world/DungeonListener.java b/src/main/java/uk/co/jacekk/bukkit/bloodmoon/feature/world/DungeonListener.java
index fdfdb1e..0fb703d 100644
--- a/src/main/java/uk/co/jacekk/bukkit/bloodmoon/feature/world/DungeonListener.java
+++ b/src/main/java/uk/co/jacekk/bukkit/bloodmoon/feature/world/DungeonListener.java
@@ -151,10 +151,8 @@ public void onPistonRetract(BlockPistonRetractEvent event) {
         World world = event.getBlock().getWorld();
         PluginConfig worldConfig = plugin.getConfig(world);
 
-        if (plugin.isEnabled(world) && worldConfig.getBoolean(Config.FEATURE_DUNGEONS_PROTECTED)) {
-            if (this.isProtected(event.getRetractLocation())) {
-                event.setCancelled(true);
-            }
+        if (plugin.isEnabled(world) && worldConfig.getBoolean(Config.FEATURE_DUNGEONS_PROTECTED) && this.isProtected(event.getRetractLocation())) {
+            event.setCancelled(true);
         }
     }