diff --git a/decorator/src/main/java/com/iluwatar/decorator/App.java b/decorator/src/main/java/com/iluwatar/decorator/App.java
index 5b072b9c2..997b649eb 100644
--- a/decorator/src/main/java/com/iluwatar/decorator/App.java
+++ b/decorator/src/main/java/com/iluwatar/decorator/App.java
@@ -57,9 +57,9 @@ public class App {
 
     // change the behavior of the simple troll by adding a decorator
     LOGGER.info("A troll with huge club surprises you.");
-    troll = new ClubbedTroll(troll);
-    troll.attack();
-    troll.fleeBattle();
-    LOGGER.info("Clubbed troll power {}.\n", troll.getAttackPower());
+    Troll clubbedTroll = new ClubbedTroll(troll);
+    clubbedTroll.attack();
+    clubbedTroll.fleeBattle();
+    LOGGER.info("Clubbed troll power {}.\n", clubbedTroll.getAttackPower());
   }
 }
diff --git a/decorator/src/test/java/com/iluwatar/decorator/ClubbedTrollTest.java b/decorator/src/test/java/com/iluwatar/decorator/ClubbedTrollTest.java
index 5221eb2da..ffa6e41a7 100644
--- a/decorator/src/test/java/com/iluwatar/decorator/ClubbedTrollTest.java
+++ b/decorator/src/test/java/com/iluwatar/decorator/ClubbedTrollTest.java
@@ -36,7 +36,7 @@ import static org.mockito.internal.verification.VerificationModeFactory.times;
 public class ClubbedTrollTest {
 
   @Test
-  public void testClubbedTroll() throws Exception {
+  public void testClubbedTroll() {
     // Create a normal troll first, but make sure we can spy on it later on.
     final Troll simpleTroll = spy(new SimpleTroll());
 
diff --git a/decorator/src/test/java/com/iluwatar/decorator/SimpleTrollTest.java b/decorator/src/test/java/com/iluwatar/decorator/SimpleTrollTest.java
index 14d944b2e..d572ad139 100644
--- a/decorator/src/test/java/com/iluwatar/decorator/SimpleTrollTest.java
+++ b/decorator/src/test/java/com/iluwatar/decorator/SimpleTrollTest.java
@@ -53,7 +53,7 @@ public class SimpleTrollTest {
   }
 
   @Test
-  public void testTrollActions() throws Exception {
+  public void testTrollActions() {
     final SimpleTroll troll = new SimpleTroll();
     assertEquals(10, troll.getAttackPower());