diff --git a/src/main/java/com/benjocraeft/sharehealth/Messenger.java b/src/main/java/com/benjocraeft/sharehealth/Messenger.java
index 14b92d7..e742712 100644
--- a/src/main/java/com/benjocraeft/sharehealth/Messenger.java
+++ b/src/main/java/com/benjocraeft/sharehealth/Messenger.java
@@ -51,25 +51,25 @@ public class Messenger {
         playersToSendLogs().forEach(p -> p.sendMessage(message));
     }
 
-    void onPlayerGotDamageMessage(Player player, double damage, Entity damager){
-        String message = damageMessage(player, damage, damager);
+    void onPlayerGotDamageMessage(Player player, double damage, Entity damagingEntity){
+        String message = damageMessage(player, damage, damagingEntity);
         playersToSendLogs().forEach(p -> p.sendMessage(message));
     }
 
-    void onPlayerGotDamageMessage(Player player, double damage, Block damager){
-        String message = damageMessage(player, damage, damager);
+    void onPlayerGotDamageMessage(Player player, double damage, Block damagingBlock){
+        String message = damageMessage(player, damage, damagingBlock);
         playersToSendLogs().forEach(p -> p.sendMessage(message));
     }
 
-    private String damageMessage(Player player, double damage, Entity damager){
-        String name = damager.getName();
-        if (damager instanceof Projectile){
-            Projectile projectile = (Projectile) damager;
+    private String damageMessage(Player player, double damage, Entity damagingEntity){
+        String damagingEntityName = damagingEntity.getName();
+        if (damagingEntity instanceof Projectile){
+            Projectile projectile = (Projectile) damagingEntity;
             ProjectileSource source = projectile.getShooter();
             if (source != null){
                 if (source instanceof Entity){
                     Entity shooterEntity = (Entity) source;
-                    name = shooterEntity.getName();
+                    damagingEntityName = shooterEntity.getName();
                 }
                 if (source instanceof BlockProjectileSource){
                     BlockProjectileSource shooterBlock = (BlockProjectileSource) source;
@@ -77,13 +77,13 @@ public class Messenger {
                 }
             }
         }
-        return damageMessage(player, damage, name);
+        return damageMessage(player, damage, damagingEntityName);
     }
 
-    private String damageMessage(Player player, double damage, Block damager){
+    private String damageMessage(Player player, double damage, Block damagingBlock){
         String name;
         try{
-            name = damager.getType().name();
+            name = damagingBlock.getType().name();
         } catch(NullPointerException e){
             name = "Unknown";
             e.printStackTrace();
@@ -105,12 +105,12 @@ public class Messenger {
     private String healMessage(Player player, double regainedHealth, RegainReason reason){
         String playerS = getPlayerName(player);
         String healingS = String.format("%.2f", regainedHealth / 2);
-        String causeS = reason.toString();
+        String reasonString = reason.toString();
         return ChatColor.BLUE + playerS
                 + ChatColor.WHITE + " - "
                 + ChatColor.GREEN + healingS
                 + ChatColor.WHITE + " - "
-                + ChatColor.YELLOW + causeS;
+                + ChatColor.YELLOW + reasonString;
     }
 
     String statisticsMessage(){
@@ -147,7 +147,7 @@ public class Messenger {
 
     private String getPlayerName(Player player){
         //Papermc:
-        //((TextComponent) player.displayName()).content();
+        //return ((TextComponent) player.displayName()).content();
 
         //Spigot:
         return player.getDisplayName();
diff --git a/src/main/java/com/benjocraeft/sharehealth/PlayerListeners.java b/src/main/java/com/benjocraeft/sharehealth/PlayerListeners.java
index 225f510..d4fce38 100644
--- a/src/main/java/com/benjocraeft/sharehealth/PlayerListeners.java
+++ b/src/main/java/com/benjocraeft/sharehealth/PlayerListeners.java
@@ -31,23 +31,24 @@ public class PlayerListeners implements Listener{
 
     @EventHandler
     public void onEntityGotDamage(final EntityDamageEvent event){
-        Entity entity = event.getEntity();
+        Entity damagedEntity = event.getEntity();
         double damage = event.getFinalDamage();
 
         DamageCause cause = event.getCause();
         // not allowed triggering message
-        // because these types trigger an extra event by entity or by block
-        DamageCause[] notAllowed = new DamageCause[]{
+        // because these types trigger an extra event by entity or by block with more
+        // detailed information for the message
+        DamageCause[] messageNotAllowed = new DamageCause[]{
                 DamageCause.ENTITY_ATTACK,
                 DamageCause.ENTITY_EXPLOSION,
                 DamageCause.PROJECTILE,
                 DamageCause.CONTACT
         };
 
-        if (entity instanceof Player){
-            boolean allowed = !Arrays.asList(notAllowed).contains(cause);
+        if (damagedEntity instanceof Player){
+            boolean isMessageAllowed = !Arrays.asList(messageNotAllowed).contains(cause);
             double absorbedDamage = -event.getOriginalDamage(DamageModifier.ABSORPTION);
-            Sharehealth.Instance.onPlayerGotDamage((Player) entity, damage, cause, allowed, absorbedDamage);
+            Sharehealth.Instance.onPlayerGotDamage((Player) damagedEntity, damage, cause, isMessageAllowed, absorbedDamage);
         }
     }
 
diff --git a/src/main/java/com/benjocraeft/sharehealth/Sharehealth.java b/src/main/java/com/benjocraeft/sharehealth/Sharehealth.java
index c74dfb8..b6b7614 100644
--- a/src/main/java/com/benjocraeft/sharehealth/Sharehealth.java
+++ b/src/main/java/com/benjocraeft/sharehealth/Sharehealth.java
@@ -107,13 +107,13 @@ public class Sharehealth extends JavaPlugin {
         healthManager.updatePlayer(player);
     }
 
-    void onPlayerGotDamage(Player player, double damage, DamageCause cause, boolean allowed, double absorbedDamage){
+    void onPlayerGotDamage(Player player, double damage, DamageCause cause, boolean isMessageAllowed, double absorbedDamage){
         if (isFailed)
             return;
 
         double receivedDamage = damage + absorbedDamage;
 
-        if (allowed)
+        if (isMessageAllowed)
             messenger.onPlayerGotDamageMessage(player, receivedDamage, cause);
 
         statistics.onPlayerGotDamage(player, receivedDamage);