diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java b/Kieker.WebGUI/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java
index 5fa991057ff58a8664ea706f4fa3c54da89cf5d0..ce09a41babd06dfa16f0ef1cf53200b9445b54d5 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java
@@ -106,10 +106,10 @@ public class FSProjectDAOImpl implements IProjectDAO, ReleaseListener {
 	private final Map<File, WeakReference<Object>> tempDirs = new ConcurrentHashMap<File, WeakReference<Object>>();
 	private final Map<String, ComponentListContainer> availableComponents = new ConcurrentHashMap<String, ComponentListContainer>();
 
-	@Autowired
-	private PluginFinder pluginFinder;
 	@Autowired
 	private Class2ModelInstanceConverter class2ModelInstanceConverter;
+	@Autowired
+	private PluginFinder pluginFinder;
 
 	/**
 	 * Default constructor. <b>Do not use this constructor. This bean is Spring managed.</b>
@@ -248,6 +248,7 @@ public class FSProjectDAOImpl implements IProjectDAO, ReleaseListener {
 
 			final File dstKaxFile = new File(FSProjectDAOImpl.ROOT_DIRECTORY + File.separator + newProjectName + File.separator + originalProjectName + "."
 					+ FSProjectDAOImpl.KAX_EXTENSION);
+
 			final File realDstKaxFile = FSProjectDAOImpl.assembleKaxFile(newProjectName);
 
 			if (!dstKaxFile.renameTo(realDstKaxFile)) {
@@ -310,12 +311,12 @@ public class FSProjectDAOImpl implements IProjectDAO, ReleaseListener {
 
 		// Store the new meta data
 		final Properties properties = FSProjectDAOImpl.loadPropertiesFile(projectName);
-		properties.put(FSProjectDAOImpl.PROPERTY_KEY_LAST_USER, username);
+		properties.put(PROPERTY_KEY_LAST_USER, username);
 		if (analysisLayout != null) {
-			properties.put(FSProjectDAOImpl.PROPERTY_KEY_ANALYSIS_LAYOUT, analysisLayout);
+			properties.put(PROPERTY_KEY_ANALYSIS_LAYOUT, analysisLayout);
 		}
 		if (cockpitLayout != null) {
-			properties.put(FSProjectDAOImpl.PROPERTY_KEY_COCKPIT_LAYOUT, cockpitLayout);
+			properties.put(PROPERTY_KEY_COCKPIT_LAYOUT, cockpitLayout);
 		}
 		FSProjectDAOImpl.savePropertiesFile(properties, projectName);
 	}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/application/ThemeSwitcherBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/application/ThemeSwitcherBean.java
index d1e7ed50b8e2f3c6e38b0b07dc9938f27d6362ff..528e8e8b79e062c8c32237fca7e2e242fca1a776 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/application/ThemeSwitcherBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/application/ThemeSwitcherBean.java
@@ -28,7 +28,8 @@ import org.springframework.stereotype.Component;
  * files.<br>
  * </br>
  * 
- * This class is a singleton scoped bean, as the list with the available themes is a static list.
+ * This class is a singleton scoped bean, as the list with the available themes is a static list.<br>
+ * </br>
  * 
  * As this bean is {@code Spring} managed, it is <b>not</b> recommended to use the constructor or the setter methods.
  * 
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/request/NewUserBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/request/NewUserBean.java
index 4d12d78c51d076008296987489a7e499d488e141..64705bd1d7c69e273f9b1ff25a1a88aa6e5be33f 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/request/NewUserBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/request/NewUserBean.java
@@ -23,8 +23,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * This simple {@code Spring} managed bean is request scoped and can be used to store the necessary data for a new user during a request. It should not be used, for
- * example, to deliver a list containing the available user within the system, as this bean contains a field for the password. For such cases you should use
- * {@link kieker.webgui.domain.User} instead.
+ * example, to deliver a list containing the available user within the system. For such cases you should use {@link kieker.webgui.domain.User} instead.
  * 
  * @author Nils Christian Ehmke
  */