diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java
index 4280816144cf138f7d3a9f54ed69c8f0d1a8cb13..9c5bb7cf8b7e213176dba271538e9591ad9ed937 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java
@@ -2,7 +2,7 @@
  * Copyright 2012 by
  *  + Christian-Albrechts-University of Kiel
  *    + Department of Computer Science
- *      + Software Engineering Group
+ *      + Software Engineering Group 
  *  and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,6 +66,9 @@ public final class ProjectsBean {
 		// No code necessary
 	}
 
+	/**
+	 * Initializes this bean.
+	 */
 	@SuppressWarnings("unused")
 	@PostConstruct
 	private void init() {
@@ -158,7 +161,13 @@ public final class ProjectsBean {
 	public String getAnalysisControllerState(final String project) {
 		final AnalysisController controller = this.analysisController.get(project);
 
-		return (controller == null) ? "N/A" : controller.getState().toString();
+		final String controllerState;
+		if (controller == null) {
+			controllerState = "N/A";
+		} else {
+			controllerState = controller.getState().toString();
+		}
+		return controllerState;
 	}
 
 	/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java
index e4144671becd8b11fe8b5228d150288917ab4522..dbf06cc36bfc622b14517905676f5af938b5df62 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java
@@ -2,7 +2,7 @@
  * Copyright 2012 by
  *  + Christian-Albrechts-University of Kiel
  *    + Department of Computer Science
- *      + Software Engineering Group
+ *      + Software Engineering Group 
  *  and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisCockpitProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisCockpitProjectBean.java
index 1b5db7db7700fb661e496c3133d07032d80c8a7f..dccd1e796ccac2c3c430dc1288b80f17e87230a5 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisCockpitProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisCockpitProjectBean.java
@@ -2,7 +2,7 @@
  * Copyright 2012 by
  *  + Christian-Albrechts-University of Kiel
  *    + Department of Computer Science
- *      + Software Engineering Group
+ *      + Software Engineering Group 
  *  and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisControllerProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisControllerProjectBean.java
index f0cd345d4a8ed16c4628d399e218284d3ae3bf69..31e42b7747dafe816224ccd52aa4fc0114967814 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisControllerProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisControllerProjectBean.java
@@ -2,7 +2,7 @@
  * Copyright 2012 by
  *  + Christian-Albrechts-University of Kiel
  *    + Department of Computer Science
- *      + Software Engineering Group
+ *      + Software Engineering Group 
  *  and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisViewWorkSpaceProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisViewWorkSpaceProjectBean.java
index c1c3d27e548c78a2f1ba9aaf5a029b9a391d58fd..0c00c4efb2ad4da2d3405a1a02c046f05ed26dae 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisViewWorkSpaceProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisViewWorkSpaceProjectBean.java
@@ -2,7 +2,7 @@
  * Copyright 2012 by
  *  + Christian-Albrechts-University of Kiel
  *    + Department of Computer Science
- *      + Software Engineering Group
+ *      + Software Engineering Group 
  *  and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentThemeBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentThemeBean.java
index 23881d9ee48e4ba32aeb9f418d21e876f231aaac..827a09661c9431edf9eb07f2cbb2387609a95a3c 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentThemeBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentThemeBean.java
@@ -2,7 +2,7 @@
  * Copyright 2012 by
  *  + Christian-Albrechts-University of Kiel
  *    + Department of Computer Science
- *      + Software Engineering Group
+ *      + Software Engineering Group 
  *  and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
index 618cdab97ec78846929ba6c428f5e88a9a2a72d3..9b2188a27f2bed9d7d1b4cfe9db11d9da504ab8d 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
@@ -2,7 +2,7 @@
  * Copyright 2012 by
  *  + Christian-Albrechts-University of Kiel
  *    + Department of Computer Science
- *      + Software Engineering Group
+ *      + Software Engineering Group 
  *  and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -155,7 +155,13 @@ public final class CurrentWorkSpaceProjectBean {
 		}
 
 		// Now deliver the correct navigation page
-		return (this.project != null) ? CurrentWorkSpaceProjectBean.PAGE_PROJECT_WORK_SPACE : "";
+		final String navigationPage;
+		if (this.project != null) {
+			navigationPage = CurrentWorkSpaceProjectBean.PAGE_PROJECT_WORK_SPACE;
+		} else {
+			navigationPage = "";
+		}
+		return navigationPage;
 	}
 
 	/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
index 91895aad7399b8f80c7f9a6ec3ebb3833f0485dd..0d87d9303ef2c2eed8840ec47bde4dc707b76466 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
@@ -2,7 +2,7 @@
  * Copyright 2012 by
  *  + Christian-Albrechts-University of Kiel
  *    + Department of Computer Science
- *      + Software Engineering Group
+ *      + Software Engineering Group 
  *  and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/FSManager.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/FSManager.java
index f03b8dde5f688a258dac1e8b4596d64afbc6635b..e41dbd3687179327f08e2e7fd528ca0db8aa5f97 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/FSManager.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/FSManager.java
@@ -2,7 +2,7 @@
  * Copyright 2012 by
  *  + Christian-Albrechts-University of Kiel
  *    + Department of Computer Science
- *      + Software Engineering Group
+ *      + Software Engineering Group 
  *  and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -251,7 +251,7 @@ public final class FSManager {
 		final List<String> result = new ArrayList<String>();
 
 		// Get all directories within our root-dir
-		final File files[] = new File(FSManager.ROOT_DIRECTORY).listFiles();
+		final File[] files = new File(FSManager.ROOT_DIRECTORY).listFiles();
 		for (final File file : files) {
 			if (file.isDirectory()) {
 				result.add(file.getName());
@@ -298,7 +298,13 @@ public final class FSManager {
 		final Object newLock = new Object();
 		final Object existLock = this.projectLocksMap.putIfAbsent(project, newLock);
 
-		return (existLock != null) ? existLock : newLock;
+		final Object lock;
+		if (existLock != null) {
+			lock = existLock;
+		} else {
+			lock = newLock;
+		}
+		return lock;
 	}
 
 	/**
@@ -375,7 +381,7 @@ public final class FSManager {
 			synchronized (lock) {
 				// Run through the libs and put them into our list.
 				final File libDir = new File(FSManager.ROOT_DIRECTORY + File.separator + projectName + File.separator + FSManager.LIB_DIRECTORY);
-				final File files[] = libDir.listFiles();
+				final File[] files = libDir.listFiles();
 				if (files != null) {
 					for (final File file : files) {
 						if (file.getName().endsWith("." + FSManager.LIB_EXTENSION)) {
@@ -409,7 +415,7 @@ public final class FSManager {
 		synchronized (lock) {
 			// Run through the libs and put them into our list.
 			final File libDir = new File(FSManager.ROOT_DIRECTORY + File.separator + projectName + File.separator + FSManager.LIB_DIRECTORY);
-			final File files[] = libDir.listFiles();
+			final File[] files = libDir.listFiles();
 			if (files != null) {
 				for (final File file : files) {
 					if (file.getName().endsWith("." + FSManager.LIB_EXTENSION)) {
@@ -465,7 +471,7 @@ public final class FSManager {
 		synchronized (lock) {
 			// Run through the libs and put them into our list.
 			final File libDir = new File(FSManager.ROOT_DIRECTORY + File.separator + projectName + File.separator + FSManager.LIB_DIRECTORY);
-			final File files[] = libDir.listFiles();
+			final File[] files = libDir.listFiles();
 			if (files != null) {
 				for (final File file : files) {
 					if (file.getName().endsWith("." + FSManager.LIB_EXTENSION)) {
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/Pair.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/Pair.java
index 23aebdd22e0a6ff93bf33e5dca518bfd99455dbd..b885bc7c9fc9a7aa8310f897ff42817671b8b1fc 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/Pair.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/Pair.java
@@ -2,7 +2,7 @@
  * Copyright 2012 by
  *  + Christian-Albrechts-University of Kiel
  *    + Department of Computer Science
- *      + Software Engineering Group
+ *      + Software Engineering Group 
  *  and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,21 +26,21 @@ package kieker.webgui.common;
  * @author Nils Christian Ehmke
  * @version 1.0
  * 
- * @param <FST>
+ * @param <F>
  *            The type of the first element.
- * @param <SND>
+ * @param <S>
  *            The type of the second element.
  */
-public class Pair<FST, SND> {
+public class Pair<F, S> {
 
 	/**
 	 * This is the first element.
 	 */
-	private FST fst;
+	private F fst;
 	/**
 	 * This is the second element.
 	 */
-	private SND snd;
+	private S snd;
 
 	/**
 	 * Creates a new instance of this class with null values stored for the elements.
@@ -57,7 +57,7 @@ public class Pair<FST, SND> {
 	 * @param snd
 	 *            The second element to be stored in this object.
 	 */
-	public Pair(final FST fst, final SND snd) {
+	public Pair(final F fst, final S snd) {
 		this.fst = fst;
 		this.snd = snd;
 	}
@@ -67,7 +67,7 @@ public class Pair<FST, SND> {
 	 * 
 	 * @return The first element.
 	 */
-	public FST getFst() {
+	public F getFst() {
 		return this.fst;
 	}
 
@@ -77,7 +77,7 @@ public class Pair<FST, SND> {
 	 * @param fst
 	 *            The new first element.
 	 */
-	public void setFst(final FST fst) {
+	public void setFst(final F fst) {
 		this.fst = fst;
 	}
 
@@ -86,7 +86,7 @@ public class Pair<FST, SND> {
 	 * 
 	 * @return The second element.
 	 */
-	public SND getSnd() {
+	public S getSnd() {
 		return this.snd;
 	}
 
@@ -96,7 +96,7 @@ public class Pair<FST, SND> {
 	 * @param snd
 	 *            The new second element.
 	 */
-	public void setSnd(final SND snd) {
+	public void setSnd(final S snd) {
 		this.snd = snd;
 	}
 
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
index 09fe5242437bf93f3e9a36644c25153684d257d4..785740ce2f5d18005874ad0926b2a38552df5d7d 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
@@ -20,6 +20,12 @@
 
 package kieker.webgui.common.exception;
 
+/**
+ * This exception shows that an project with the same name exists already.
+ * 
+ * @author Nils Christian Ehmke
+ * @version 1.0
+ */
 public class ProjectAlreadyExistingException extends Exception {
 
 	private static final long serialVersionUID = 1L;