diff --git a/src/main/java/teetime/framework/pipe/PipeFactoryRegistry.java b/src/main/java/teetime/framework/pipe/PipeFactoryRegistry.java
index 47821865af26ebaab9735c5ce9790325b8d11e3e..44c209205e7a49b025ca61bb7a484dcc073c13a6 100644
--- a/src/main/java/teetime/framework/pipe/PipeFactoryRegistry.java
+++ b/src/main/java/teetime/framework/pipe/PipeFactoryRegistry.java
@@ -9,8 +9,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Provides PipeFactories, which are used to connect stages.
- * The instance of this singleton class is saved in <code>PipeFactoryRegistry.INSTANCE</code>.
+ * Represents a Registry which provides PipeFactories that are used to create pipes.
+ * The instance of this singleton class is saved in {@link PipeFactoryRegistry#INSTANCE}.
  * <p>
  * To get a PipeFactory instance, call {@link #getPipeFactory(ThreadCommunication, PipeOrdering, boolean)}.
  *
@@ -43,6 +43,9 @@ public class PipeFactoryRegistry {
 
 	private final Map<String, IPipeFactory> pipeFactories = new HashMap<String, IPipeFactory>();
 
+	/**
+	 * The singleton instance of PipeFactoryRegistry
+	 */
 	public static PipeFactoryRegistry INSTANCE = new PipeFactoryRegistry();
 
 	private PipeFactoryRegistry() {
@@ -78,7 +81,7 @@ public class PipeFactoryRegistry {
 	}
 
 	/**
-	 * Registers a new PipeFactory to the registry.<br />
+	 * Adds a new PipeFactory to the registry.<br />
 	 * The new PipeFactory will be automatically selected by the Registry, if it is the most suitable Factory
 	 * corresponding to the requirements.
 	 *