diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/.ratings b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/.ratings
index b4ce5dcc61c16ff677231387ac2491099f539c63..3b5a065d023457ab75f3c450a9a9a12b97bd32c3 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/.ratings
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/.ratings
@@ -8,7 +8,7 @@ LayoutDataUIUtils.java 0b2d3d1f47eef070c11b56fb7b332e0e49fa5a52 GREEN
 PropertiesViewUtils.java 009d390b8aa41bb79b45b1e09a3375d0374fa139 GREEN
 RectangleLayoutUIUtils.java b64f2f86b8254363689bf0809f681fc59a87a04a GREEN
 SnapToGridUtils.java 0ee536d1c1028aec313c59d533d6717b68febc85 GREEN
-StatusUtils.java f81d4c9a2ac359712844753f4dc4b9a896776673 YELLOW
+StatusUtils.java c62809aa963c6faad02d61655a08a7e2e9402909 RED
 TableViewerUtils.java 7b72baa029b4a8a5371464f78fe6f2829e2e87eb GREEN
 TreeViewerUtils.java 296ae7efad3a472c00522be723d7853710069177 GREEN
 ZoomUIUtils.java 0e04976d43076e7e4b3f2d244a303463c71390f5 GREEN
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/StatusUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/StatusUtils.java
index 51f20ea452e2c76cb25fa0a671216695d9e38081..f7bf3ce6e47c14a90ffdd6a1e25d041af0267df3 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/StatusUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/StatusUtils.java
@@ -20,6 +20,7 @@ import org.fortiss.tooling.kernel.model.constraints.ConstraintInstance;
 import org.fortiss.tooling.kernel.model.constraints.FailedConstraintInstanceStatus;
 import org.fortiss.tooling.kernel.model.constraints.IConstraintInstanceContainer;
 
+// TODO (SB, 9): The class name is misleading (focus is on constraints here). Further, areAllInstancesSuccessful() is not used anywhere -> remove altogether? 
 /**
  * Methods for accessing the status line.
  * 
@@ -44,7 +45,11 @@ public class StatusUtils {
 
 		for(ConstraintInstance ci : instanceContainer.getConstraintInstances()) {
 			if(constraintToFind.equalsIgnoreCase(ci.getConstraintName())) {
+				// TODO (SB,19): toString() not needed for String?
+				// TODO(SB,19): Combine these 3 nested if's into one (using appropriately named
+				// boolean variables)
 				if(currentActiveConstraints.contains(constraintToFind.toString())) {
+					// TODO (SB,19): toString() not needed for String?
 					if(ci.getConstraintName().equalsIgnoreCase(constraintToFind.toString())) {
 						// If the constraint instance has a "failed status"
 						if(ci.getStatus() instanceof FailedConstraintInstanceStatus) {