diff --git a/flyweight/src/main/java/com/iluwatar/Potion.java b/flyweight/src/main/java/com/iluwatar/Potion.java
index 257ce0aa5..126ce8b32 100644
--- a/flyweight/src/main/java/com/iluwatar/Potion.java
+++ b/flyweight/src/main/java/com/iluwatar/Potion.java
@@ -7,6 +7,5 @@ package com.iluwatar;
  */
 public interface Potion {
 
-	public void drink();
-
+	void drink();
 }
diff --git a/flyweight/src/main/java/com/iluwatar/PotionFactory.java b/flyweight/src/main/java/com/iluwatar/PotionFactory.java
index 078d99163..71586dced 100644
--- a/flyweight/src/main/java/com/iluwatar/PotionFactory.java
+++ b/flyweight/src/main/java/com/iluwatar/PotionFactory.java
@@ -1,6 +1,7 @@
 package com.iluwatar;
 
 import java.util.EnumMap;
+import java.util.Map;
 
 /**
  * 
@@ -12,7 +13,7 @@ import java.util.EnumMap;
  */
 public class PotionFactory {
 
-	private EnumMap<PotionType, Potion> potions;
+	private final Map<PotionType, Potion> potions;
 
 	public PotionFactory() {
 		potions = new EnumMap<>(PotionType.class);
diff --git a/flyweight/src/main/java/com/iluwatar/PotionType.java b/flyweight/src/main/java/com/iluwatar/PotionType.java
index c283fd916..9d63ee9f1 100644
--- a/flyweight/src/main/java/com/iluwatar/PotionType.java
+++ b/flyweight/src/main/java/com/iluwatar/PotionType.java
@@ -7,6 +7,5 @@ package com.iluwatar;
  */
 public enum PotionType {
 
-	HEALING, INVISIBILITY, STRENGTH, HOLY_WATER, POISON;
-
+	HEALING, INVISIBILITY, STRENGTH, HOLY_WATER, POISON
 }