diff --git a/src/main/java/com/gamingmesh/jobs/Jobs.java b/src/main/java/com/gamingmesh/jobs/Jobs.java
index 53ea9fd7..91064f33 100644
--- a/src/main/java/com/gamingmesh/jobs/Jobs.java
+++ b/src/main/java/com/gamingmesh/jobs/Jobs.java
@@ -523,9 +523,7 @@ public class Jobs extends JavaPlugin {
      * @return the number of slots
      */
     public static int getUsedSlots(Job job) {
-	if (usedSlots.containsKey(job))
-	    return usedSlots.get(job);
-	return 0;
+	return usedSlots.getOrDefault(job, 0);
     }
 
     /**
diff --git a/src/main/java/com/gamingmesh/jobs/PermissionManager.java b/src/main/java/com/gamingmesh/jobs/PermissionManager.java
index c4f69a1f..a7a32bb2 100644
--- a/src/main/java/com/gamingmesh/jobs/PermissionManager.java
+++ b/src/main/java/com/gamingmesh/jobs/PermissionManager.java
@@ -94,8 +94,7 @@ public class PermissionManager {
     }
 
     private int getDelay(String perm) {
-	Integer delay = permDelay.get(perm);
-	return delay == null ? 1 : delay;
+	return permDelay.getOrDefault(perm, 1);
     }
 
     public PermissionManager() {
@@ -167,8 +166,8 @@ public class PermissionManager {
 	    jPlayer.setPermissionsCache(permissions);
 	    jPlayer.setLastPermissionUpdate(System.currentTimeMillis());
 	}
-	Boolean resul = permissions.get(perm);
-	return resul == null ? false : resul;
+
+	return permissions.getOrDefault(perm, false);
     }
 
 }
diff --git a/src/main/java/com/gamingmesh/jobs/PlayerManager.java b/src/main/java/com/gamingmesh/jobs/PlayerManager.java
index bab555ba..88ce2f4e 100644
--- a/src/main/java/com/gamingmesh/jobs/PlayerManager.java
+++ b/src/main/java/com/gamingmesh/jobs/PlayerManager.java
@@ -119,16 +119,16 @@ public class PlayerManager {
     }
 
     public void addPlayerToCache(JobsPlayer jPlayer) {
-	if (jPlayer.getName() != null && playersCache.get(jPlayer.getName().toLowerCase()) == null)
+	if (jPlayer.getName() != null && !playersCache.containsKey(jPlayer.getName().toLowerCase()))
 	    playersCache.put(jPlayer.getName().toLowerCase(), jPlayer);
-	if (jPlayer.getUniqueId() != null && playersUUIDCache.get(jPlayer.getUniqueId()) == null)
+	if (jPlayer.getUniqueId() != null && !playersUUIDCache.containsKey(jPlayer.getUniqueId()))
 	    playersUUIDCache.put(jPlayer.getUniqueId(), jPlayer);
     }
 
     public void addPlayer(JobsPlayer jPlayer) {
-	if (jPlayer.getName() != null && players.get(jPlayer.getName().toLowerCase()) == null)
+	if (jPlayer.getName() != null && !players.containsKey(jPlayer.getName().toLowerCase()))
 	    players.put(jPlayer.getName().toLowerCase(), jPlayer);
-	if (jPlayer.getUniqueId() != null && playersUUID.get(jPlayer.getUniqueId()) == null)
+	if (jPlayer.getUniqueId() != null && !playersUUID.containsKey(jPlayer.getUniqueId()))
 	    playersUUID.put(jPlayer.getUniqueId(), jPlayer);
     }
 
@@ -136,10 +136,10 @@ public class PlayerManager {
 	if (player == null)
 	    return null;
 
-	if (players.get(player.getName()) != null)
+	if (players.containsKey(player.getName()))
 	    players.remove(player.getName().toLowerCase());
 
-	JobsPlayer jPlayer = playersUUID.get(player.getUniqueId()) != null ? playersUUID.remove(player.getUniqueId()) : null;
+	JobsPlayer jPlayer = playersUUID.containsKey(player.getUniqueId()) ? playersUUID.remove(player.getUniqueId()) : null;
 	return jPlayer;
     }
 
@@ -790,11 +790,8 @@ public class PlayerManager {
      * @return True if he have permission
      */
     public boolean getJobsLimit(JobsPlayer jPlayer, Short currentCount) {
-
 	Double max = Jobs.getPermissionManager().getMaxPermission(jPlayer, "jobs.max");
-
 	max = max == null ? Jobs.getGCManager().getMaxJobs() : max;
-
 	if (max > currentCount)
 	    return true;
 
diff --git a/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java b/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java
index 6e996d21..0775766a 100644
--- a/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java
+++ b/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java
@@ -60,18 +60,14 @@ public class BlockProtectionManager {
 
     public BlockProtection addP(Location loc, Long time, boolean paid, boolean cache) {
 	String v = loc.getBlockX() + ":" + loc.getBlockY() + ":" + loc.getBlockZ();
-	HashMap<String, HashMap<String, HashMap<String, BlockProtection>>> regions = map.get(loc.getWorld());
-	if (regions == null)
-	    regions = new HashMap<>();
-	String region = locToRegion(loc);
-	HashMap<String, HashMap<String, BlockProtection>> chunks = regions.get(region);
-	if (chunks == null)
-	    chunks = new HashMap<>();
-	String chunk = locToChunk(loc);
-	HashMap<String, BlockProtection> Bpm = chunks.get(chunk);
-	if (Bpm == null)
-	    Bpm = new HashMap<>();
 
+	HashMap<String, HashMap<String, HashMap<String, BlockProtection>>> regions = map.getOrDefault(loc.getWorld(), new HashMap<>());
+
+	String region = locToRegion(loc);
+	HashMap<String, HashMap<String, BlockProtection>> chunks = regions.getOrDefault(region, new HashMap<>());
+
+	String chunk = locToChunk(loc);
+	HashMap<String, BlockProtection> Bpm = chunks.getOrDefault(chunk, new HashMap<>());
 	BlockProtection Bp = Bpm.get(v);
 
 	if (Bp == null)
diff --git a/src/main/java/com/gamingmesh/jobs/config/BossBarManager.java b/src/main/java/com/gamingmesh/jobs/config/BossBarManager.java
index f9bc190c..5d98d267 100644
--- a/src/main/java/com/gamingmesh/jobs/config/BossBarManager.java
+++ b/src/main/java/com/gamingmesh/jobs/config/BossBarManager.java
@@ -55,9 +55,7 @@ public class BossBarManager {
 	if (!Jobs.getGCManager().BossBarsMessageByDefault)
 	    return;
 
-	Boolean show = ToggleBarHandling.getBossBarToggle().get(playerUUID) == null ? true :
-	    ToggleBarHandling.getBossBarToggle().get(playerUUID);
-
+	Boolean show = ToggleBarHandling.getBossBarToggle().getOrDefault(playerUUID, true);
 	if (!show)
 	    return;
 
diff --git a/src/main/java/com/gamingmesh/jobs/container/Boost.java b/src/main/java/com/gamingmesh/jobs/container/Boost.java
index 339527a3..176bfc51 100644
--- a/src/main/java/com/gamingmesh/jobs/container/Boost.java
+++ b/src/main/java/com/gamingmesh/jobs/container/Boost.java
@@ -20,9 +20,7 @@ public class Boost {
     }
 
     public BoostMultiplier get(BoostOf boostoff) {
-	if (!map.containsKey(boostoff))
-	    return new BoostMultiplier();
-	return map.get(boostoff);
+	return map.getOrDefault(boostoff, new BoostMultiplier());
     }
 
     public double get(BoostOf boostoff, CurrencyType BT) {
diff --git a/src/main/java/com/gamingmesh/jobs/container/BoostMultiplier.java b/src/main/java/com/gamingmesh/jobs/container/BoostMultiplier.java
index 1b022d2a..a5bde06c 100644
--- a/src/main/java/com/gamingmesh/jobs/container/BoostMultiplier.java
+++ b/src/main/java/com/gamingmesh/jobs/container/BoostMultiplier.java
@@ -51,10 +51,7 @@ public class BoostMultiplier {
     }
 
     public double get(CurrencyType type) {
-	if (!map.containsKey(type))
-	    return 0D;
-
-	return map.get(type);
+	return map.getOrDefault(type, 0D);
     }
 
     public Long getTime() {
diff --git a/src/main/java/com/gamingmesh/jobs/container/Log.java b/src/main/java/com/gamingmesh/jobs/container/Log.java
index a381cbe3..b11e8bf5 100644
--- a/src/main/java/com/gamingmesh/jobs/container/Log.java
+++ b/src/main/java/com/gamingmesh/jobs/container/Log.java
@@ -19,18 +19,14 @@ public final class Log {
     }
 
     public void add(String item, HashMap<CurrencyType, Double> amounts) {
-	LogAmounts LAmount = this.amountMap.get(item);
-	if (LAmount == null)
-	    LAmount = new LogAmounts(item);
+	LogAmounts LAmount = amountMap.getOrDefault(item, new LogAmounts(item));
 	LAmount.addCount();
 	LAmount.add(amounts);
 	this.amountMap.put(item, LAmount);
     }
 
     public void add(String item, int count, HashMap<CurrencyType, Double> amounts) {
-	LogAmounts LAmount = this.amountMap.get(item);
-	if (LAmount == null)
-	    LAmount = new LogAmounts(item);
+	LogAmounts LAmount = amountMap.getOrDefault(item, new LogAmounts(item));
 	LAmount.setCount(count);
 	LAmount.add(amounts);
 	LAmount.setNewEntry(false);
diff --git a/src/main/java/com/gamingmesh/jobs/container/LogAmounts.java b/src/main/java/com/gamingmesh/jobs/container/LogAmounts.java
index 66bbd7c8..33aec7f8 100644
--- a/src/main/java/com/gamingmesh/jobs/container/LogAmounts.java
+++ b/src/main/java/com/gamingmesh/jobs/container/LogAmounts.java
@@ -40,16 +40,13 @@ public final class LogAmounts {
     public void add(CurrencyType type, Double amount) {
 	if (amount == null)
 	    return;
-	Double a = amounts.get(type);
-	if (a == null)
-	    a = 0D;
+
+	Double a = amounts.getOrDefault(type, 0D);
 	amounts.put(type, a + amount);
     }
 
     public Double get(CurrencyType type) {
-	Double a = amounts.get(type);
-	if (a == null)
-	    a = 0D;
+	Double a = amounts.getOrDefault(type, 0D);
 	return ((int) (a * 100D)) / 100D;
     }
 
diff --git a/src/main/java/com/gamingmesh/jobs/container/QuestProgression.java b/src/main/java/com/gamingmesh/jobs/container/QuestProgression.java
index e6dca148..e0bd3adf 100644
--- a/src/main/java/com/gamingmesh/jobs/container/QuestProgression.java
+++ b/src/main/java/com/gamingmesh/jobs/container/QuestProgression.java
@@ -49,8 +49,7 @@ public class QuestProgression {
     }
 
     public int getAmountDone(QuestObjective objective) {
-	Integer amountDone = done.get(objective);
-	return amountDone == null ? 0 : amountDone;
+	return done.getOrDefault(objective, 0);
     }
 
     public void setAmountDone(QuestObjective objective, int amountDone) {
diff --git a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java
index aa6c50a7..766c2cbf 100644
--- a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java
+++ b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java
@@ -795,10 +795,7 @@ public abstract class JobsDAO {
     private HashMap<Integer, ArrayList<JobsDAOData>> map = new HashMap<>();
 
     public List<JobsDAOData> getAllJobs(PlayerInfo pInfo) {
-	List<JobsDAOData> list = map.get(pInfo.getID());
-	if (list != null)
-	    return list;
-	return new ArrayList<JobsDAOData>();
+	return map.getOrDefault(pInfo.getID(), new ArrayList<JobsDAOData>());
     }
 
     public void cleanUsers() {
diff --git a/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java b/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java
index 64841ea3..3e0f87bf 100644
--- a/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java
+++ b/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java
@@ -225,8 +225,7 @@ public class BufferedEconomy {
 
 	String playerUUID = payment.getOfflinePlayer().getUniqueId().toString();
 
-	Boolean show = ToggleBarHandling.getActionBarToggle().get(playerUUID) == null ? true :
-		    ToggleBarHandling.getActionBarToggle().get(playerUUID);
+	Boolean show = ToggleBarHandling.getActionBarToggle().getOrDefault(playerUUID, true);
 	Player abp = Bukkit.getPlayer(payment.getOfflinePlayer().getUniqueId());
 	if ((abp != null) && (show.booleanValue())) {
 	    String Message = Jobs.getLanguage().getMessage("command.toggle.output.paid.main");
diff --git a/src/main/java/com/gamingmesh/jobs/economy/BufferedPayment.java b/src/main/java/com/gamingmesh/jobs/economy/BufferedPayment.java
index 78608bba..b169703f 100644
--- a/src/main/java/com/gamingmesh/jobs/economy/BufferedPayment.java
+++ b/src/main/java/com/gamingmesh/jobs/economy/BufferedPayment.java
@@ -81,8 +81,7 @@ public class BufferedPayment {
     }
 
     public Double get(CurrencyType type) {
-	Double amount = this.payments.get(type);
-	return amount == null ? 0 : amount;
+	return payments.getOrDefault(type, 0d);
     }
 
     public Double set(CurrencyType type, double amount) {