diff --git a/src/main/java/li/strolch/model/ModelGenerator.java b/src/main/java/li/strolch/model/ModelGenerator.java
index 5b42d828e..1091f2946 100644
--- a/src/main/java/li/strolch/model/ModelGenerator.java
+++ b/src/main/java/li/strolch/model/ModelGenerator.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import ch.eitchnet.utils.helper.StringHelper;
 import li.strolch.model.parameter.BooleanParameter;
 import li.strolch.model.parameter.DateParameter;
 import li.strolch.model.parameter.FloatParameter;
@@ -28,6 +27,7 @@ import li.strolch.model.parameter.LongParameter;
 import li.strolch.model.parameter.Parameter;
 import li.strolch.model.parameter.StringListParameter;
 import li.strolch.model.parameter.StringParameter;
+import ch.eitchnet.utils.helper.StringHelper;
 
 /**
  * Class which can be used to generate objects which implement {@link StrolchElement}. These generated classes can then
diff --git a/src/main/java/li/strolch/model/Resource.java b/src/main/java/li/strolch/model/Resource.java
index 63b36e552..7a86483d8 100644
--- a/src/main/java/li/strolch/model/Resource.java
+++ b/src/main/java/li/strolch/model/Resource.java
@@ -15,11 +15,11 @@
  */
 package li.strolch.model;
 
+import li.strolch.model.Locator.LocatorBuilder;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import li.strolch.model.Locator.LocatorBuilder;
-
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
  */
diff --git a/src/main/java/li/strolch/model/parameter/BooleanParameter.java b/src/main/java/li/strolch/model/parameter/BooleanParameter.java
index 2ea3a0769..57b56117c 100644
--- a/src/main/java/li/strolch/model/parameter/BooleanParameter.java
+++ b/src/main/java/li/strolch/model/parameter/BooleanParameter.java
@@ -17,10 +17,11 @@ package li.strolch.model.parameter;
 
 import java.text.MessageFormat;
 
-import org.w3c.dom.Element;
-
 import li.strolch.exception.StrolchException;
 import li.strolch.model.Tags;
+
+import org.w3c.dom.Element;
+
 import ch.eitchnet.utils.helper.StringHelper;
 
 /**
diff --git a/src/test/java/li/strolch/model/timedstate/TimeStateTest.java b/src/test/java/li/strolch/model/timedstate/TimeStateTest.java
index c21c9027f..d91d9efa0 100644
--- a/src/test/java/li/strolch/model/timedstate/TimeStateTest.java
+++ b/src/test/java/li/strolch/model/timedstate/TimeStateTest.java
@@ -18,8 +18,6 @@ package li.strolch.model.timedstate;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import li.strolch.model.timedstate.ITimedState;
-import li.strolch.model.timedstate.TimedState;
 import li.strolch.model.timevalue.ITimeValue;
 import li.strolch.model.timevalue.IValueChange;
 import li.strolch.model.timevalue.impl.DoubleValue;
diff --git a/src/test/java/li/strolch/model/timevalue/FloatTimeVariableTest.java b/src/test/java/li/strolch/model/timevalue/FloatTimeVariableTest.java
index 8e16f85ac..0f788d2ca 100644
--- a/src/test/java/li/strolch/model/timevalue/FloatTimeVariableTest.java
+++ b/src/test/java/li/strolch/model/timevalue/FloatTimeVariableTest.java
@@ -22,9 +22,6 @@ import static org.junit.Assert.assertTrue;
 import java.util.Collection;
 import java.util.SortedSet;
 
-import li.strolch.model.timevalue.ITimeValue;
-import li.strolch.model.timevalue.IValue;
-import li.strolch.model.timevalue.IValueChange;
 import li.strolch.model.timevalue.impl.DoubleValue;
 import li.strolch.model.timevalue.impl.TimeVariable;
 import li.strolch.model.timevalue.impl.ValueChange;
diff --git a/src/test/java/li/strolch/model/timevalue/IntegerTimeVariableTest.java b/src/test/java/li/strolch/model/timevalue/IntegerTimeVariableTest.java
index 5e2cad7cc..d1a5b346e 100644
--- a/src/test/java/li/strolch/model/timevalue/IntegerTimeVariableTest.java
+++ b/src/test/java/li/strolch/model/timevalue/IntegerTimeVariableTest.java
@@ -23,9 +23,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.SortedSet;
 
-import li.strolch.model.timevalue.ITimeValue;
-import li.strolch.model.timevalue.IValue;
-import li.strolch.model.timevalue.IValueChange;
 import li.strolch.model.timevalue.impl.IntegerValue;
 import li.strolch.model.timevalue.impl.TimeVariable;
 import li.strolch.model.timevalue.impl.ValueChange;
diff --git a/src/test/java/li/strolch/model/timevalue/StringTimeVariableTest.java b/src/test/java/li/strolch/model/timevalue/StringTimeVariableTest.java
index e1b6ae38e..f8a8143ff 100644
--- a/src/test/java/li/strolch/model/timevalue/StringTimeVariableTest.java
+++ b/src/test/java/li/strolch/model/timevalue/StringTimeVariableTest.java
@@ -25,9 +25,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 
-import li.strolch.model.timevalue.ITimeValue;
-import li.strolch.model.timevalue.IValue;
-import li.strolch.model.timevalue.IValueChange;
 import li.strolch.model.timevalue.impl.AString;
 import li.strolch.model.timevalue.impl.StringSetValue;
 import li.strolch.model.timevalue.impl.TimeVariable;
diff --git a/src/test/java/li/strolch/model/timevalue/ValueTests.java b/src/test/java/li/strolch/model/timevalue/ValueTests.java
index bab00c1ff..ed0991a3d 100644
--- a/src/test/java/li/strolch/model/timevalue/ValueTests.java
+++ b/src/test/java/li/strolch/model/timevalue/ValueTests.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
 import java.util.HashSet;
 import java.util.Set;
 
-import li.strolch.model.timevalue.IValue;
 import li.strolch.model.timevalue.impl.AString;
 import li.strolch.model.timevalue.impl.DoubleValue;
 import li.strolch.model.timevalue.impl.IntegerValue;