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 2e041c11733ebcd222396ae9a8e2617f5c6c220f..84dbffeef214fde5a0fbb76e5edb6e4b5aecf97c 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
@@ -34,7 +34,6 @@ import javax.faces.bean.ApplicationScoped;
 import javax.faces.bean.ManagedBean;
 import javax.faces.context.FacesContext;
 
-import kieker.analysis.AnalysisController;
 import kieker.analysis.model.analysisMetaModel.MIProject;
 import kieker.common.logging.Log;
 import kieker.common.logging.LogFactory;
@@ -179,7 +178,7 @@ public final class ProjectsBean {
 	 * 
 	 * @param project
 	 *            The project whose state should be delivered.
-	 * @return The current state of the corresponding {@link AnalysisController} as defined by {@link ACManager#getAnalysisControllerStateString(String)}.
+	 * @return The current state of the corresponding AnalysisController as defined by {@link ACManager#getAnalysisControllerStateString(String)}.
 	 */
 	public String getAnalysisControllerState(final String project) {
 		return ACManager.getInstance().getAnalysisControllerStateString(project);
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 044c86ba132853d171b03a6ee020159433a3df1a..941b213ba95ffd9970723ed58678d4cb0682ebf2 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
@@ -29,15 +29,12 @@ import javax.faces.context.FacesContext;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 
-import kieker.webgui.beans.application.ThemeSwitcherBean;
-
 /**
  * This bean contains the current user theme (look and feel) of the (session) user. The default value is the "glass-x"-theme, if no other value can be find within
  * the parameters of the faces context or in the cookies of the user.
  * 
  * @author Nils Christian Ehmke
  * 
- * @see ThemeSwitcherBean
  * @version 1.0
  */
 @ManagedBean
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 304c1bfb1be4ae4f9b75483b856c92073435d161..6d7f16c85cedb22e3592125240222074a43dadba 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
@@ -41,14 +41,14 @@ public final class UserBean implements Serializable {
 	 * The serial version UID.
 	 */
 	private static final long serialVersionUID = 3942693805646862667L;
-	/**
-	 * This field contains the name of the user.
-	 */
-	private final String userName;
 	/**
 	 * The counter to get a number for the current user and to differ the sessions in test purposes.
 	 */
 	private static final AtomicLong GUEST_COUNTER = new AtomicLong();
+	/**
+	 * This field contains the name of the user.
+	 */
+	private final String userName;
 
 	/**
 	 * Creates a new instance of this class. The user name is set to "Guest".
@@ -57,6 +57,9 @@ public final class UserBean implements Serializable {
 		this.userName = "Guest #" + UserBean.GUEST_COUNTER.getAndIncrement();
 	}
 
+	/**
+	 * This method should only be called automatically by the JVM just before the object is destroyed.
+	 */
 	@PreDestroy
 	protected void destroy() {
 		UserBean.GUEST_COUNTER.decrementAndGet();
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
index 62f4f1c48efbe452ae11b15658252aac9aa403f1..3819230b4266f488640740e0919d8b400f209745 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
@@ -76,11 +76,17 @@ public class CurrentProjectOverviewBean {
 		this.projectName = projectName;
 	}
 
+	/**
+	 * This method should only be called automatically by the JVM to update the projects list.
+	 */
 	@PostConstruct
 	protected void init() {
 		this.updateLists();
 	}
 
+	/**
+	 * Updates the list containing the available projects name.
+	 */
 	public void updateLists() {
 		final ELResolver el = FacesContext.getCurrentInstance().getApplication().getELResolver();
 		final ProjectsBean bean = (ProjectsBean) el.getValue(FacesContext.getCurrentInstance().getELContext(), null, "projectsBean");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/ACManager.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/ACManager.java
index a696057eb99e9b680de2da29fd7c56f834acce63..2634ce703dbcb55ea940f164c059c68fc41c6a04 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/ACManager.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/ACManager.java
@@ -58,7 +58,7 @@ import kieker.webgui.common.exception.ProjectStillRunningException;
  * @version 1.0
  */
 // TODO How to differ between views and displays with same names?
-public final class ACManager {
+public final class ACManager { // NOCS (Class Data Abstraction Coupling)
 	/**
 	 * This is the log for errors, exceptions etc.
 	 */
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 96f34d467b60693e2ea0c8730ac924ae945e725f..b6f866e8b52971b39bcc422f5d528af656a722cc 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/FSManager.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/FSManager.java
@@ -60,7 +60,7 @@ import org.primefaces.model.UploadedFile;
  */
 // TODO Projects have to check their lock once they entered the synchronized block in order to make sure that they have still the valid one (and not a removed one
 // from an older project)
-public final class FSManager {
+public final class FSManager { // NOCS (Class Data Abstraction Coupling, Class Fan-Out Complexity)
 	/**
 	 * This is the log object used to log messages, warnings etc.
 	 */