diff --git a/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/java/first/Pi.java b/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/java/first/Pi.java
index 45ac3fad9c..5acf970ce5 100644
--- a/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/java/first/Pi.java
+++ b/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/java/first/Pi.java
@@ -4,17 +4,20 @@
 
 package akka.tutorial.java.first;
 
-import akka.actor.*;
-import static akka.actor.Actors.*;
-
-import akka.routing.*;
-import static akka.routing.Routing.Broadcast;
-
-import akka.dispatch.Dispatchers;
-
+import static akka.actor.Actors.actorOf;
+import static akka.actor.Actors.poisonPill;
 import static java.util.Arrays.asList;
+
 import java.util.concurrent.CountDownLatch;
 
+import akka.actor.ActorRef;
+import akka.actor.UntypedActor;
+import akka.actor.UntypedActorFactory;
+import akka.routing.CyclicIterator;
+import akka.routing.InfiniteIterator;
+import akka.routing.Routing.Broadcast;
+import akka.routing.UntypedLoadBalancer;
+
 /**
  * First part in Akka tutorial for Java.
  * <p/>
@@ -82,7 +85,7 @@ public class Pi {
 
     // define the work
     private double calculatePiFor(int arg, int nrOfElements) {
-      double acc = 0.0D;
+      double acc = 0.0;
       for (int i = arg * nrOfElements; i <= ((arg + 1) * nrOfElements - 1); i++) {
         acc += 4 * Math.pow(-1, i) / (2 * i + 1);
       }
@@ -92,7 +95,7 @@ public class Pi {
     // message handler
     public void onReceive(Object message) {
       if (message instanceof Work) {
-        Work work = (Work)message;
+        Work work = (Work) message;
         getContext().replyUnsafe(new Result(calculatePiFor(work.getArg(), work.getNrOfElements()))); // perform the work
       } else throw new IllegalArgumentException("Unknown message [" + message + "]");
     }
@@ -102,7 +105,6 @@ public class Pi {
   // ===== Master =====
   // ==================
   static class Master extends UntypedActor {
-    private final int nrOfWorkers;
     private final int nrOfMessages;
     private final int nrOfElements;
     private final CountDownLatch latch;
@@ -126,7 +128,6 @@ public class Pi {
     }
 
     public Master(int nrOfWorkers, int nrOfMessages, int nrOfElements, CountDownLatch latch) {
-      this.nrOfWorkers = nrOfWorkers;
       this.nrOfMessages = nrOfMessages;
       this.nrOfElements = nrOfElements;
       this.latch = latch;
@@ -163,7 +164,7 @@ public class Pi {
       } else if (message instanceof Result) {
 
         // handle result from the worker
-        Result result = (Result)message;
+        Result result = (Result) message;
         pi += result.getValue();
         nrOfResults += 1;
         if (nrOfResults == nrOfMessages) getContext().stop();