diff --git a/engine/src/main/java/org/terasology/rendering/nui/widgets/UIList.java b/engine/src/main/java/org/terasology/rendering/nui/widgets/UIList.java
index 4b4e0b1a4af..b7e0f0d6f6a 100644
--- a/engine/src/main/java/org/terasology/rendering/nui/widgets/UIList.java
+++ b/engine/src/main/java/org/terasology/rendering/nui/widgets/UIList.java
@@ -137,13 +137,17 @@ public void bindSelectable(Binding<Boolean> binding) {
         selectable = binding;
     }
 
-    public boolean isInteractive() { return interactive.get(); }
+    public boolean isInteractive() {
+        return interactive.get();
+    }
 
     public boolean isSelectable() {
         return selectable.get();
     }
 
-    public void setInteractive(boolean value) { interactive.set(value); }
+    public void setInteractive(boolean value) {
+        interactive.set(value);
+    }
 
     public void setSelectable(boolean value) {
         selectable.set(value);
diff --git a/modules/Core/src/main/java/org/terasology/rendering/nui/layers/ingame/inventory/ItemIcon.java b/modules/Core/src/main/java/org/terasology/rendering/nui/layers/ingame/inventory/ItemIcon.java
index d8537fa2e2c..a37974bdb94 100644
--- a/modules/Core/src/main/java/org/terasology/rendering/nui/layers/ingame/inventory/ItemIcon.java
+++ b/modules/Core/src/main/java/org/terasology/rendering/nui/layers/ingame/inventory/ItemIcon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 MovingBlocks
+ * Copyright 2016 MovingBlocks
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,8 +39,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- */
 public class ItemIcon extends CoreWidget {
 
     @LayoutConfig