diff --git a/.checkstyle b/.checkstyle
index c8fcb90b1fc00df80ddc1ae04d157b8e4fb04578..cfd4ee68000a768710181eb392865d1d50631f1c 100644
--- a/.checkstyle
+++ b/.checkstyle
@@ -11,4 +11,5 @@
   <fileset name="all" enabled="true" check-config-name="TeeTime" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
+  <filter name="WriteProtectedFiles" enabled="true"/>
 </fileset-config>
diff --git a/.project b/.project
index 8252855991e5e997d70ee601af87e296f7da084e..9c7a3eb0d7770870a1a8064f5071cf4d6d79247e 100644
--- a/.project
+++ b/.project
@@ -20,27 +20,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
 		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index 875d0623d0be4e3d2be8fd97ddcd22c3edcd0b26..daa4c5b85fba5c65e0727db9144b524012b43edd 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
 #FindBugs User Preferences
-#Tue Dec 16 15:34:05 CET 2014
+#Wed Dec 17 07:36:29 CET 2014
 detector_threshold=3
 effort=max
 excludefilter0=.fbExcludeFilterFile|true
diff --git a/pom.xml b/pom.xml
index eed67af9546aef9f51c668c187c07857588cab3a..d746a568b2edef057d73358a7f2c80f8b604a0bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,28 +182,28 @@
 			</plugin>
 
 			<!-- Checkstyle -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.12</version>
-				<executions>
-					<execution>
-						<phase>test</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<configLocation>${basedir}/conf/quality-config/cs-conf.xml</configLocation>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<encoding>UTF-8</encoding>
-							<consoleOutput>true</consoleOutput>
-							<failsOnError>false</failsOnError>
-							<failOnViolation>false</failOnViolation>
-							<linkXRef>false</linkXRef>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 				<artifactId>maven-checkstyle-plugin</artifactId> -->
+<!-- 				<version>2.12</version> -->
+<!-- 				<executions> -->
+<!-- 					<execution> -->
+<!-- 						<phase>test</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>check</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<configLocation>${project.basedir}/conf/quality-config/cs-conf.xml</configLocation> -->
+<!-- 							<includeTestSourceDirectory>true</includeTestSourceDirectory> -->
+<!-- 							<encoding>UTF-8</encoding> -->
+<!-- 							<consoleOutput>true</consoleOutput> -->
+<!-- 							<failsOnError>false</failsOnError> -->
+<!-- 							<failOnViolation>false</failOnViolation> -->
+<!-- 							<linkXRef>false</linkXRef> -->
+<!-- 						</configuration> -->
+<!-- 					</execution> -->
+<!-- 				</executions> -->
+<!-- 			</plugin> -->
 
 			<!-- Findbugs -->
 			<plugin>
@@ -215,7 +215,7 @@
 					<threshold>Low</threshold>
 					<includeTests>true</includeTests>
 					<failOnError>false</failOnError>
-					<excludeFilterFile>${basedir}/conf/quality-config/fb-filter.xml</excludeFilterFile>
+					<excludeFilterFile>${project.basedir}/conf/quality-config/fb-filter.xml</excludeFilterFile>
 				</configuration>
 				<executions>
 					<execution>
@@ -235,7 +235,7 @@
 
 				<configuration>
 					<rulesets>
-						<ruleset>${basedir}/conf/quality-config/pmd-ruleset.xml</ruleset>
+						<ruleset>${project.basedir}/conf/quality-config/pmd-ruleset.xml</ruleset>
 					</rulesets>
 					<includeTests>true</includeTests>
 					<targetJdk>${java.version}</targetJdk>
diff --git a/src/main/java/teetime/stage/CollectorSink.java b/src/main/java/teetime/stage/CollectorSink.java
index 9cd33751d0d9b97db5cf991badf43a0e6cae4fea..5d8b45841a9b66ec31c094253d1a3ee64ab541ff 100644
--- a/src/main/java/teetime/stage/CollectorSink.java
+++ b/src/main/java/teetime/stage/CollectorSink.java
@@ -1,18 +1,3 @@
-/***************************************************************************
- * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ***************************************************************************/
 package teetime.stage;
 
 import java.util.ArrayList;
@@ -21,6 +6,9 @@ import java.util.List;
 import teetime.framework.AbstractConsumerStage;
 
 /**
+ * @param <T>
+ *            the type of the elements to be collected
+ *
  * @author Christian Wulf
  *
  * @since 1.0
@@ -30,7 +18,7 @@ public final class CollectorSink<T> extends AbstractConsumerStage<T> {
 	private final List<T> elements;
 
 	/**
-	 * Creates a new {@link CollectorSink} with an {@link ArrayList}.
+	 * Creates a new {@link CollectorSink} with an empty {@link ArrayList}.
 	 */
 	public CollectorSink() {
 		this(new ArrayList<T>());