diff --git a/thread-pool/src/main/java/com/iluwatar/threadpool/App.java b/thread-pool/src/main/java/com/iluwatar/threadpool/App.java
index 0a7bed3a0..bfaaead31 100644
--- a/thread-pool/src/main/java/com/iluwatar/threadpool/App.java
+++ b/thread-pool/src/main/java/com/iluwatar/threadpool/App.java
@@ -13,14 +13,19 @@ import java.util.concurrent.Executors;
  *  more tasks than threads. As soon as a thread completes its task, it will request the next 
  *  task from the queue until all tasks have been completed. The thread can then terminate, or 
  *  sleep until there are new tasks available.
- *  
+ *  <p>
  *  In this example we create a list of tasks presenting work to be done. Each task is then 
- *  wrapped into a Worker object that implements Runnable. We create an ExecutorService with
- *  fixed number of threads (Thread Pool) and use them to execute the Workers.
+ *  wrapped into a {@link Worker} object that implements {@link Runnable}. We create an 
+ *  {@link ExecutorService} with fixed number of threads (Thread Pool) and use them to execute 
+ *  the {@link Worker}s.
  *
  */
 public class App {
 	
+	/**
+	 * Program entry point
+	 * @param args command line args
+	 */
     public static void main( String[] args ) {
     	
     	System.out.println("Program started");
diff --git a/thread-pool/src/main/java/com/iluwatar/threadpool/Worker.java b/thread-pool/src/main/java/com/iluwatar/threadpool/Worker.java
index b6ee5e665..92da4b5dd 100644
--- a/thread-pool/src/main/java/com/iluwatar/threadpool/Worker.java
+++ b/thread-pool/src/main/java/com/iluwatar/threadpool/Worker.java
@@ -2,7 +2,7 @@ package com.iluwatar.threadpool;
 
 /**
  * 
- * Worker implements Runnable and thus can be executed by ExecutorService
+ * Worker implements {@link Runnable} and thus can be executed by {@link ExecutorService}
  *
  */
 public class Worker implements Runnable {
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java
index ec5c031ff..71cfea5f7 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java
@@ -4,6 +4,11 @@ import org.junit.Test;
 
 import com.iluwatar.threadpool.App;
 
+/**
+ * Application test
+ * @author ilkka
+ *
+ */
 public class AppTest {
 	
 	@Test