diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index d1a313e..19659fe 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,5 +2,6 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="ArraysAsListWithZeroOrOneArgument" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
 </component>
\ No newline at end of file
diff --git a/src/main/java/com/benjocraeft/sharehealth/Commands.java b/src/main/java/com/benjocraeft/sharehealth/Commands.java
index 6b81308..69f8ff6 100644
--- a/src/main/java/com/benjocraeft/sharehealth/Commands.java
+++ b/src/main/java/com/benjocraeft/sharehealth/Commands.java
@@ -5,6 +5,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 import java.util.function.Consumer;
@@ -69,7 +70,7 @@ public class Commands implements TabExecutor {
 
 
     @Override
-    public List<String> onTabComplete(CommandSender commandSender, Command command, String s, String[] strings) {
+    public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, String[] strings) {
         List<String> list = new ArrayList<>();
 
         if (strings.length == 1){
@@ -87,7 +88,7 @@ public class Commands implements TabExecutor {
     }
 
     @Override
-    public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args){
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args){
 
         List<String> argList = Arrays.asList(args);
         Pair<Consumer<CommandSender>, String> command = commands.get(argList);
diff --git a/src/main/java/com/benjocraeft/sharehealth/Messenger.java b/src/main/java/com/benjocraeft/sharehealth/Messenger.java
index 8de7030..fb15035 100644
--- a/src/main/java/com/benjocraeft/sharehealth/Messenger.java
+++ b/src/main/java/com/benjocraeft/sharehealth/Messenger.java
@@ -41,7 +41,7 @@ public class Messenger {
     }
 
     void sendFailedMessage(Player cause){
-        String message = "Mission failed, go next! CAUSE: " + ChatColor.RED + cause.getDisplayName();
+        String message = "Mission failed, go next! CAUSE: " + ChatColor.RED + cause.displayName();
         Bukkit.getOnlinePlayers().forEach(p -> p.sendMessage(message));
     }
 
@@ -96,7 +96,7 @@ public class Messenger {
     }
 
     private String damageMessage(Player player, double damage){
-        String playerS = player.getDisplayName();
+        String playerS = player.displayName().examinableName();
         String damageS = String.format("%.2f", damage / 2);
         return ChatColor.BLUE + playerS
                 + ChatColor.WHITE + " shared "
@@ -105,7 +105,7 @@ public class Messenger {
     }
 
     private String healMessage(Player player, double regainedHealth, RegainReason reason){
-        String playerS = player.getDisplayName();
+        String playerS = player.displayName().examinableName();
         String healingS = String.format("%.2f", regainedHealth / 2);
         String causeS = reason.toString();
         return ChatColor.BLUE + playerS
diff --git a/src/main/java/com/benjocraeft/sharehealth/Sharehealth.java b/src/main/java/com/benjocraeft/sharehealth/Sharehealth.java
index f714971..2f938ec 100644
--- a/src/main/java/com/benjocraeft/sharehealth/Sharehealth.java
+++ b/src/main/java/com/benjocraeft/sharehealth/Sharehealth.java
@@ -38,7 +38,7 @@ public class Sharehealth extends JavaPlugin {
 
     boolean isFailed = false;
 
-    private Map<String, Object> defaultStatus = new HashMap<>();
+    private final Map<String, Object> defaultStatus = new HashMap<>();
     {
         defaultStatus.put("health", 20.);
         defaultStatus.put("isFailed", false);
@@ -215,9 +215,7 @@ public class Sharehealth extends JavaPlugin {
         Map<String, Object> map = fileManager.loadStatus();
 
         defaultStatus.forEach(map::putIfAbsent);
-        map.forEach((String key, Object value) -> {
-            getLogger().info(key + "=" + value);
-        });
+        map.forEach((String key, Object value) -> getLogger().info(key + "=" + value));
 
         healthManager.setHealth((Double)map.get("health"));
         isFailed = (boolean) map.get("isFailed");