diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/ModelBuilder.java b/goofy-server/src/main/java/de/itvsh/goofy/common/ModelBuilder.java
index e6eecac6911538f9b12f6f01028d68e55152e129..4ba954e31ac56a14e804ef86dee5912b30182bb8 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/ModelBuilder.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/ModelBuilder.java
@@ -159,7 +159,7 @@ public class ModelBuilder<T> {
 	private List<Field> getFields(Class<? extends Annotation> annotationClass) {
 		var fields = Optional.ofNullable(ANNOTATED_FIELDS_BY_ANNOTATION.get(getEntity().getClass()))
 				.map(fieldsByAnnotation -> fieldsByAnnotation.get(annotationClass))
-				.orElseGet(() -> Collections.emptyList());
+				.orElseGet(Collections::emptyList);
 
 		if (CollectionUtils.isEmpty(fields)) {
 			fields = FieldUtils.getFieldsListWithAnnotation(getEntity().getClass(), annotationClass);
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/UserProfileUrlProvider.java b/goofy-server/src/main/java/de/itvsh/goofy/common/UserProfileUrlProvider.java
index 5e600a0c6cafcc6a1a80106a14127dd7759b9e62..c084a7c6cf3cffd11a19677e169888b675dc4c07 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/UserProfileUrlProvider.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/UserProfileUrlProvider.java
@@ -32,7 +32,10 @@ import com.google.common.base.Preconditions;
 
 @Component
 public class UserProfileUrlProvider implements ApplicationContextAware {
+	// TODO auf javax.validation umstellen
 	private static final String ERROR_MESSAGE = "Key %s missing, please add it to the application.yml";
+	// TODO applicationContext darf nicht static abgelegt werden - es sollte möglich
+	// sein, dass eine andere Konfiguration in der jvm läuft.
 	private static ApplicationContext applicationContext;
 	static final String URL_ROOT_KEY = "kop.user-manager.url";
 	static final String USER_PROFILES_TEMPLATE_KEY = "kop.user-manager.profile-template";
@@ -47,14 +50,17 @@ public class UserProfileUrlProvider implements ApplicationContextAware {
 	}
 
 	public static String getUrl(Object val) {
+		// TODO Abhängingkeit zu com.google.common ausbauen
 		Preconditions.checkNotNull(applicationContext, "ApplicationContext not initialized");
 
+		// TODO parameter lieber injezieren und validation verwenden
 		var rootUrl = applicationContext.getEnvironment().getProperty(URL_ROOT_KEY);
 		Preconditions.checkNotNull(rootUrl, ERROR_MESSAGE, URL_ROOT_KEY);
 
 		var template = applicationContext.getEnvironment().getProperty(USER_PROFILES_TEMPLATE_KEY);
 		Preconditions.checkNotNull(template, ERROR_MESSAGE, USER_PROFILES_TEMPLATE_KEY);
 
+		// TODO UriComponent Builder verwenden
 		var profilesUrl = rootUrl + template;
 		return String.format(profilesUrl, val);
 	}