diff --git a/src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java b/src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java
index 7df7b97..9a56355 100644
--- a/src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java
+++ b/src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java
@@ -61,7 +61,7 @@ public class InCommonEntityOrderingStrategy<T> implements ItemOrderingStrategy<T
      *
      * @param <T> type of item to be handled
      */
-    private static class OrderableItem<T> implements Comparable<OrderableItem> {
+    private static class OrderableItem<T> implements Comparable<OrderableItem<T>> {
 
         /** The wrapped {@link Element} {@link Item}. */
         private final Item<T> item;
@@ -87,7 +87,7 @@ public OrderableItem(@Nonnull final Item<T> domItem,
         }
 
         @Override
-        public int compareTo(@Nonnull final OrderableItem o) {
+        public int compareTo(final OrderableItem<T> o) {
             // compare registrar values
             final int c = registrar.compareTo(o.registrar);
             // done if unequal
@@ -118,7 +118,7 @@ public InCommonEntityOrderingStrategy(@Nonnull final String registrar) {
     }
 
     @Override
-    public List<Item<T>> order(@Nonnull @NonnullElements final List<Item<T>> items) {
+    public @Nonnull List<Item<T>> order(@Nonnull @NonnullElements final List<Item<T>> items) {
 
         // Collect the results here
         final List<Item<T>> results = new ArrayList<>(items.size());
@@ -152,7 +152,7 @@ public List<Item<T>> order(@Nonnull @NonnullElements final List<Item<T>> items)
                     entityID = itemids.get(0).getId();
                 }
 
-                orderableList.add(new OrderableItem(item, registrar, entityID));
+                orderableList.add(new OrderableItem<T>(item, registrar, entityID));
             }
         } catch (final StageProcessingException e) {
             /*
@@ -173,7 +173,7 @@ public List<Item<T>> order(@Nonnull @NonnullElements final List<Item<T>> items)
         Collections.sort(orderableList);
 
         // Add the ordered results into the results collection
-        for (final OrderableItem result : orderableList) {
+        for (final var result : orderableList) {
             results.add(result.unwrap());
         }
 
diff --git a/src/test/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategyTest.java b/src/test/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategyTest.java
index 2503892..17f98c2 100644
--- a/src/test/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategyTest.java
+++ b/src/test/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategyTest.java
@@ -4,6 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
@@ -20,7 +22,7 @@ protected InCommonEntityOrderingStrategyTest() {
         super(InCommonEntityOrderingStrategy.class);
     }
 
-    private Item<Element> makeItem(String registrar, String entityID) throws Exception {
+    private Item<Element> makeItem(@Nonnull String registrar, @Nonnull String entityID) throws Exception {
         final Item<Element> item = new DOMElementItem(readXMLData("trivial.xml"));
         item.getItemMetadata().put(new ItemId(entityID));
         item.getItemMetadata().put(new RegistrationAuthority(registrar));
@@ -60,8 +62,8 @@ public void testOrder() throws Exception {
         Assert.assertEquals(items.size(), 8);
 
         // Order the collection
-        final InCommonEntityOrderingStrategy strat = new InCommonEntityOrderingStrategy(registrar_d);
-        final List<Item<Element>>items2 = strat.order(items);
+        final var strat = new InCommonEntityOrderingStrategy<Element>(registrar_d);
+        final var items2 = strat.order(items);
 
         // Check that everything is in the right place afterwards
         Assert.assertEquals(items2.size(), items.size());