diff --git a/src/main/java/kieker/diagnosis/common/domain/AggregatedOperationCall.java b/src/main/java/kieker/diagnosis/common/domain/AggregatedOperationCall.java
index 16c69b5e4726c7b0146a9930db174c23b7cc946c..c8140759c9f907b297a03a147da1976166ab6909 100644
--- a/src/main/java/kieker/diagnosis/common/domain/AggregatedOperationCall.java
+++ b/src/main/java/kieker/diagnosis/common/domain/AggregatedOperationCall.java
@@ -42,9 +42,9 @@ public final class AggregatedOperationCall extends AbstractOperationCall<Aggrega
 		this.setStackSize(call.getStackSize());
 	}
 
-	public AggregatedOperationCall(final String container, final String component, final String operation, final String failedCause, final long totalDuration,
-			final long medianDuration,
-			final long minDuration, final long maxDuration, final long meanDuration, final int calls) {
+	public AggregatedOperationCall(final String container, final String component, final String operation, // NOPMD (a long parameter list cannot be avoided)
+			final String failedCause, final long totalDuration, final long medianDuration, final long minDuration, final long maxDuration, final long meanDuration,
+			final int calls) {
 		super(container, component, operation);
 
 		this.totalDuration = totalDuration;
diff --git a/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallExtractor.java b/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallExtractor.java
index b96fa7a18408b634ab0f87cb6940b61bd16d755f..e4aa3fcec2f5665359411300310823ececfc9dae 100644
--- a/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallExtractor.java
+++ b/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallExtractor.java
@@ -1,3 +1,19 @@
+/***************************************************************************
+ * 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 kieker.diagnosis.common.model.importer.stages;
 
 import kieker.diagnosis.common.domain.OperationCall;
diff --git a/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallHandlerComposite.java b/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallHandlerComposite.java
index a63722138d2c923c35226c36b20afd58dc4b67d3..73c8226e02664ffa76233a3bf9e239a42091d935 100644
--- a/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallHandlerComposite.java
+++ b/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallHandlerComposite.java
@@ -43,8 +43,8 @@ public final class OperationCallHandlerComposite extends CompositeStage {
 	private final CollectorSink<AggregatedOperationCall> aggCallCollector;
 	private final CollectorSink<AggregatedOperationCall> aggFailedCallCollector;
 
-	public OperationCallHandlerComposite(final List<OperationCall> operationCalls, final List<OperationCall> failedOperationCalls, final List<AggregatedOperationCall> aggOperationCalls,
-			final List<AggregatedOperationCall> aggFailedOperationCalls) {
+	public OperationCallHandlerComposite(final List<OperationCall> operationCalls, final List<OperationCall> failedOperationCalls,
+			final List<AggregatedOperationCall> aggOperationCalls, final List<AggregatedOperationCall> aggFailedOperationCalls) {
 		this.operationCallExtractor = new OperationCallExtractor();
 		this.callCollector = new CollectorSink<>(operationCalls);
 		final Distributor<OperationCall> distributor1 = new Distributor<>(new CopyByReferenceStrategy());
diff --git a/src/main/java/kieker/diagnosis/common/util/Mapper.java b/src/main/java/kieker/diagnosis/common/util/Mapper.java
index 588189f5fad6c49bed35cb400582edad084b6e60..0f5b5dea3fb79627395ecabc31148ea10151ae46 100644
--- a/src/main/java/kieker/diagnosis/common/util/Mapper.java
+++ b/src/main/java/kieker/diagnosis/common/util/Mapper.java
@@ -40,7 +40,7 @@ public final class Mapper<I, O> {
 		return null;
 	}
 
-	public class To {
+	public final class To {
 
 		private final I key;
 
@@ -48,7 +48,7 @@ public final class Mapper<I, O> {
 			this.key = key;
 		}
 
-		public void to(final O value) {
+		public void to(final O value) { // NOPMD (the method name may be short, but this is acceptable in this case)
 			Mapper.this.internalMap.put(this.key, value);
 		}
 
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/OperationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/OperationSortListener.java
index 33fb88e49c038de2a490dc15f2b05e9d6d5391ca..ff50b2aba850abb57f7de133b9b73807556e26e2 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/OperationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/OperationSortListener.java
@@ -5,7 +5,7 @@
  * 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
+ *     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,
diff --git a/src/main/java/kieker/diagnosis/subview/calls/util/OperationSortListener.java b/src/main/java/kieker/diagnosis/subview/calls/util/OperationSortListener.java
index 9582950c7564c7daa503cbf3efe386a88d3b6908..4ac82c5168028d7113f0670f4afa3108fdba47bf 100644
--- a/src/main/java/kieker/diagnosis/subview/calls/util/OperationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/calls/util/OperationSortListener.java
@@ -5,7 +5,7 @@
  * 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
+ *     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,