diff --git a/src/main/java/kieker/diagnosis/common/model/importer/stages/LegacyTraceReconstructor.java b/src/main/java/kieker/diagnosis/common/model/importer/stages/LegacyTraceReconstructor.java
index 4f6846b7b8f67a3883334d0eff1c4ace3e3288ee..db9d5bbbb7215a9019b6b1eb89fea4a8c600335a 100644
--- a/src/main/java/kieker/diagnosis/common/model/importer/stages/LegacyTraceReconstructor.java
+++ b/src/main/java/kieker/diagnosis/common/model/importer/stages/LegacyTraceReconstructor.java
@@ -16,6 +16,7 @@
 
 package kieker.diagnosis.common.model.importer.stages;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -74,13 +75,7 @@ final class LegacyTraceReconstructor extends AbstractStage<OperationExecutionRec
 		}
 
 		public Trace reconstructTrace() {
-			Collections.sort(this.records, new Comparator<OperationExecutionRecord>() {
-
-				@Override
-				public int compare(final OperationExecutionRecord o1, final OperationExecutionRecord o2) {
-					return Long.compare(o1.getEoi(), o2.getEoi());
-				}
-			});
+			Collections.sort(this.records, new EOIComparator());
 
 			OperationCall root = null;
 			OperationCall header = null;
@@ -114,6 +109,17 @@ final class LegacyTraceReconstructor extends AbstractStage<OperationExecutionRec
 			return this.traceComplete;
 		}
 
+		private static final class EOIComparator implements Comparator<OperationExecutionRecord>, Serializable {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public int compare(final OperationExecutionRecord o1, final OperationExecutionRecord o2) {
+				return Long.compare(o1.getEoi(), o2.getEoi());
+			}
+
+		}
+
 	}
 
 }
diff --git a/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallAggregator.java b/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallAggregator.java
index 108fcaf0bf7b05d80db46d5c56bc471ee4f87db3..ab7b96e28997074d46a828ed20236fcd6118b004 100644
--- a/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallAggregator.java
+++ b/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallAggregator.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 java.util.ArrayList;
diff --git a/src/main/java/kieker/diagnosis/common/util/Mapper.java b/src/main/java/kieker/diagnosis/common/util/Mapper.java
index d8cd6cc504981bd3f877b356ee55f4e8fdaf2c10..588189f5fad6c49bed35cb400582edad084b6e60 100644
--- a/src/main/java/kieker/diagnosis/common/util/Mapper.java
+++ b/src/main/java/kieker/diagnosis/common/util/Mapper.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.util;
 
 import java.util.HashMap;
@@ -5,18 +21,18 @@ import java.util.Map;
 
 public final class Mapper<I, O> {
 
-	private final Map<I, O> map = new HashMap<>();
+	private final Map<I, O> internalMap = new HashMap<>();
 
 	public To map(final I key) {
 		return new To(key);
 	}
 
 	public O resolve(final I key) {
-		return this.map.get(key);
+		return this.internalMap.get(key);
 	}
 
 	public I invertedResolve(final O value) {
-		for (final Map.Entry<I, O> entry : this.map.entrySet()) {
+		for (final Map.Entry<I, O> entry : this.internalMap.entrySet()) {
 			if (value.equals(entry.getValue())) {
 				return entry.getKey();
 			}
@@ -28,12 +44,12 @@ public final class Mapper<I, O> {
 
 		private final I key;
 
-		private To(final I key) {
+		To(final I key) {
 			this.key = key;
 		}
 
 		public void to(final O value) {
-			Mapper.this.map.put(this.key, value);
+			Mapper.this.internalMap.put(this.key, value);
 		}
 
 	}
diff --git a/src/main/java/kieker/diagnosis/subview/Filter.java b/src/main/java/kieker/diagnosis/subview/Filter.java
index 0393eeb0e11b2625d8459024190a658c594b821e..cb39935e61058f436e1e22745fd9f0a62cbbc25f 100644
--- a/src/main/java/kieker/diagnosis/subview/Filter.java
+++ b/src/main/java/kieker/diagnosis/subview/Filter.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/aggregatedcalls/util/AverageDurationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/AverageDurationSortListener.java
index e3d77deddab59cee8ea8a214f859f5a60997e123..c3cda239477628752129fd40159660e9516e1a86 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/AverageDurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/AverageDurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
 import kieker.diagnosis.common.domain.AggregatedOperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class AverageDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class AverageDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/CallsSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/CallsSortListener.java
index 0c9caad16cd1772d91b34c566660e596dd5e0a2d..dc76cc5bc384ea49ca0e21645531f6c015357238 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/CallsSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/CallsSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
 import kieker.diagnosis.common.domain.AggregatedOperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class CallsSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class CallsSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ComponentSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ComponentSortListener.java
index 7f42cb762426d2e949a4ea09e727f989d1169249..82063f58b06b70d0724963a9e9f9516f04d810d7 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ComponentSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ComponentSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
 import kieker.diagnosis.common.domain.AggregatedOperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class ComponentSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class ComponentSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ContainerSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ContainerSortListener.java
index bf72640171febc04d7e78305e9c8b7fe24fda536..36be5420c1ee521056dbcacb15cc032a127b3cfd 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ContainerSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ContainerSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
 import kieker.diagnosis.common.domain.AggregatedOperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class ContainerSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class ContainerSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MaximalDurationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MaximalDurationSortListener.java
index 25b676a777d0b513fc0b407d344d8d8f2fa685f1..3816279969762fe97bd78fc7e72b48c495ce1a1b 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MaximalDurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MaximalDurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
 import kieker.diagnosis.common.domain.AggregatedOperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class MaximalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class MaximalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MedianDurationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MedianDurationSortListener.java
index 2f9c79d93f8d3011e39167c4a0a3d44a556b9919..25bb2ba2d6e29a7e591824b4bf2afd2f64b3078a 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MedianDurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MedianDurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
 import kieker.diagnosis.common.domain.AggregatedOperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class MedianDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class MedianDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MinimalDurationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MinimalDurationSortListener.java
index 7064009322e7926562384d8f145876482b0e282a..3ac0ea408b3c7f95dc61b28425d98085323d5e9f 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MinimalDurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MinimalDurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
 import kieker.diagnosis.common.domain.AggregatedOperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class MinimalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class MinimalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
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 1987d5519257f4315f469c03b2887a6b9a2e6743..33fb88e49c038de2a490dc15f2b05e9d6d5391ca 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/OperationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/OperationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
 import kieker.diagnosis.common.domain.AggregatedOperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class OperationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class OperationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/TotalDurationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/TotalDurationSortListener.java
index 0ac0a160000fbf6c83acd9b4216cc8b9e5a41f24..8974d3c2e6a9ec3c2aff189cdd4f00b39e827d61 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/TotalDurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/TotalDurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
 import kieker.diagnosis.common.domain.AggregatedOperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class TotalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class TotalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/kieker/diagnosis/subview/calls/util/ComponentSortListener.java b/src/main/java/kieker/diagnosis/subview/calls/util/ComponentSortListener.java
index 13c867076f8e82d48964ce051f9313d58d44fa67..a7e2ee27cc8efaadb701696642303f6896e1476f 100644
--- a/src/main/java/kieker/diagnosis/subview/calls/util/ComponentSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/calls/util/ComponentSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.calls.util;
 import kieker.diagnosis.common.domain.OperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class ComponentSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
+public final class ComponentSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/kieker/diagnosis/subview/calls/util/ContainerSortListener.java b/src/main/java/kieker/diagnosis/subview/calls/util/ContainerSortListener.java
index 28204a842af5ef6aa8ae3f2846d77b3ac0d622aa..33be95cb549185f5775d04f94284e67e3c041a16 100644
--- a/src/main/java/kieker/diagnosis/subview/calls/util/ContainerSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/calls/util/ContainerSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.calls.util;
 import kieker.diagnosis.common.domain.OperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class ContainerSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
+public final class ContainerSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/kieker/diagnosis/subview/calls/util/DurationSortListener.java b/src/main/java/kieker/diagnosis/subview/calls/util/DurationSortListener.java
index 3d8ea8edb9965120f3594a6e7d0d7f4daf6d54cd..c3f731c9b49fa3b356ed203721809be414ded58e 100644
--- a/src/main/java/kieker/diagnosis/subview/calls/util/DurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/calls/util/DurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.calls.util;
 import kieker.diagnosis.common.domain.OperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class DurationSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
+public final class DurationSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
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 d9e1c037176250d488d1b503daaafea2db5b58a2..9582950c7564c7daa503cbf3efe386a88d3b6908 100644
--- a/src/main/java/kieker/diagnosis/subview/calls/util/OperationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/calls/util/OperationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.calls.util;
 import kieker.diagnosis.common.domain.OperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class OperationSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
+public final class OperationSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/kieker/diagnosis/subview/calls/util/TraceIDSortListener.java b/src/main/java/kieker/diagnosis/subview/calls/util/TraceIDSortListener.java
index aff55b231c921708b09bdca34f5deb18f73ad88a..227dbfac0a23b9e31cd0822ddfb97fb157fe26f6 100644
--- a/src/main/java/kieker/diagnosis/subview/calls/util/TraceIDSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/calls/util/TraceIDSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.calls.util;
 import kieker.diagnosis.common.domain.OperationCall;
 import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
 
-public class TraceIDSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
+public final class TraceIDSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
 
 	private static final long serialVersionUID = 1L;