4 files changed, 7 insertions, 9 deletions

diff --git a/src/Entities/EntityEffect.cpp b/src/Entities/EntityEffect.cpp
index f58738aef..fdcbe822e 100644
--- a/src/Entities/EntityEffect.cpp
+++ b/src/Entities/EntityEffect.cpp
@@ -38,7 +38,7 @@ cEntityEffect::eType cEntityEffect::GetPotionEffectType(short a_ItemDamage)
 		case 0x0d: return cEntityEffect::effWaterBreathing;
 		case 0x0e: return cEntityEffect::effInvisibility;
 			
-			// No effect potions
+		// No effect potions
 		case 0x00:
 		case 0x07:
 		case 0x0b:  // Will be potion of leaping in 1.8
diff --git a/src/Entities/EntityEffect.h b/src/Entities/EntityEffect.h
index 04e25e303..f9c1e4eb2 100644
--- a/src/Entities/EntityEffect.h
+++ b/src/Entities/EntityEffect.h
@@ -44,8 +44,7 @@ public:
 	static cEntityEffect::eType GetPotionEffectType(short a_ItemDamage);
 	
 	
-	/** Retrieves the intensity level from the potion's damage value.
-	 Returns 0 for level I potions, 1 for level II potions. */
+	/** Retrieves the intensity level from the potion's damage value. Returns 0 for level I potions, 1 for level II potions. */
 	static short GetPotionEffectIntensity(short a_ItemDamage);
 	
 	
diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp
index d874a86e1..ed16f060d 100644
--- a/src/Entities/SplashPotionEntity.cpp
+++ b/src/Entities/SplashPotionEntity.cpp
@@ -75,9 +75,6 @@ cSplashPotionEntity::cSplashPotionEntity(
 	cItem a_Item
 ) :
 	super(pkSplashPotion, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25),
-	m_EntityEffectType(cEntityEffect::effNoEffect),
-	m_EntityEffect(cEntityEffect()),
-	m_PotionColor(0),
 	m_DestroyTimer(-1)
 {
 	SetSpeed(a_Speed);
diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h
index cc974c8b9..24614cd8a 100644
--- a/src/Items/ItemPotion.h
+++ b/src/Items/ItemPotion.h
@@ -63,9 +63,11 @@ public:
 			return false;
 		}
 		
-		a_Player->AddEntityEffect(cEntityEffect::GetPotionEffectType(PotionDamage),
-								  cEntityEffect::GetPotionEffectDuration(PotionDamage),
-								  cEntityEffect::GetPotionEffectIntensity(PotionDamage));
+		a_Player->AddEntityEffect(
+			cEntityEffect::GetPotionEffectType(PotionDamage),
+			cEntityEffect::GetPotionEffectDuration(PotionDamage),
+			cEntityEffect::GetPotionEffectIntensity(PotionDamage)
+		);
 		a_Player->GetInventory().RemoveOneEquippedItem();
 		a_Player->GetInventory().AddItem(E_ITEM_GLASS_BOTTLE);
 		return true;