diff --git a/li.strolch.model/src/main/java/li/strolch/model/State.java b/li.strolch.model/src/main/java/li/strolch/model/State.java
index 76bf0a402..ebebc3101 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/State.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/State.java
@@ -15,8 +15,10 @@
  */
 package li.strolch.model;
 
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toSet;
+
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import li.strolch.exception.StrolchException;
 import li.strolch.model.activity.Activity;
@@ -245,7 +247,7 @@ public enum State {
 
 	public static State getState(Activity activity) {
 
-		Set<State> states = activity.elementStream().map(e -> e.getValue().getState()).collect(Collectors.toSet());
+		Set<State> states = activity.elementStream().map(e -> e.getValue().getState()).collect(toSet());
 
 		// if only one state
 		if (states.size() == 1)
@@ -288,7 +290,7 @@ public enum State {
 			return CREATED;
 
 		// should never happen, unless new state is introduced
-		throw new IllegalStateException("Unhandled situation with states: " + states.stream().map(e -> e.state)
-				.collect(Collectors.joining(", ")));
+		throw new IllegalStateException(
+				"Unhandled situation with states: " + states.stream().map(e -> e.state).collect(joining(", ")));
 	}
 }