diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java b/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java
index 5f22558198e..2f44bb8aff6 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java
@@ -125,8 +125,9 @@ public class DeckProxy implements InventoryItem {
         if (sbSize == Integer.MIN_VALUE) {
             CardPool sb = getDeck().get(DeckSection.Sideboard);
             sbSize = sb == null ? -1 : sb.countAll();
-            if( sbSize == 0 )
+            if (sbSize == 0) {
                 sbSize = -1;
+            }
         }
         return sbSize;
     }
@@ -144,8 +145,8 @@ public class DeckProxy implements InventoryItem {
 
     private static void addDecksRecursivelly(List<DeckProxy> list, String path, IStorage<Deck> folder) {
         for (IStorage<Deck> f : folder.getFolders()) {
-           String subPath = (StringUtils.isBlank(path) ? "" : path) + "/" + f.getName();
-           addDecksRecursivelly(list, subPath, f);
+            String subPath = (StringUtils.isBlank(path) ? "" : path) + "/" + f.getName();
+            addDecksRecursivelly(list, subPath, f);
         }
 
         for (Deck d : folder) {
@@ -179,20 +180,23 @@ public class DeckProxy implements InventoryItem {
     }
     
     public void reloadFromStorage() {
-        if( null != storage )
+        if (storage != null) {
             deck = storage.get(getName());
+        }
         invalidateCache();
     }
     
     @SuppressWarnings("unchecked")
     public void updateInStorage() {
-        if ( storage instanceof StorageImmediatelySerialized<?> )
+        if (storage instanceof StorageImmediatelySerialized<?>) {
             ((StorageImmediatelySerialized<IHasName>)storage).add(deck);
+        }
     }
     
     public void deleteFromStorage() { 
-        if ( storage instanceof StorageImmediatelySerialized<?> )
+        if (storage instanceof StorageImmediatelySerialized<?>) {
             storage.delete(getName());
+        }
     }    
 
     private static class ThemeDeckGenerator extends DeckProxy {
diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java
index 5b0f10b903d..3e9d5ced8a2 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java
@@ -254,16 +254,16 @@ public enum CCurrentDeck implements ICDoc {
         return null;
     }
 
-        /** The Constant HTML_FILTER. */
-        public static final FileFilter HTML_FILTER = new FileFilter() {
-            @Override
-            public boolean accept(final File f) {
-                return f.getName().endsWith(".html") || f.isDirectory();
-            }
+    /** The Constant HTML_FILTER. */
+    public static final FileFilter HTML_FILTER = new FileFilter() {
+        @Override
+        public boolean accept(final File f) {
+            return f.getName().endsWith(".html") || f.isDirectory();
+        }
 
-            @Override
-            public String getDescription() {
-                return "Proxy File .html";
-            }
-        };
+        @Override
+        public String getDescription() {
+            return "Proxy File .html";
+        }
+    };
 }
diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java
index 6fff7e94280..bbf78a8f14e 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java
@@ -47,8 +47,7 @@ public class DeckController<T extends DeckBase> {
      * @param view0 the view0
      * @param newModelCreator0 the new model creator0
      */
-    public DeckController(final IStorage<T> folder0, final ACEditorBase<?, T> view0,
-            final Supplier<T> newModelCreator0) {
+    public DeckController(final IStorage<T> folder0, final ACEditorBase<?, T> view0, final Supplier<T> newModelCreator0) {
         this.rootFolder = folder0;
         this.currentFolder = rootFolder;
         this.view = view0;
@@ -94,7 +93,7 @@ public class DeckController<T extends DeckBase> {
         if (model.getName().isEmpty()) {
             return true;
         }
-        
+
         final T modelStored = this.currentFolder.get(this.model.getName());
         // checks presence in dictionary only.
         if (modelStored == this.model) {
@@ -142,13 +141,15 @@ public class DeckController<T extends DeckBase> {
     }
 
     public void load(final String path, final String name) {
-        if ( StringUtils.isBlank(path))
+        if (StringUtils.isBlank(path)) {
             currentFolder = rootFolder;
-        else
+        }
+        else {
             currentFolder = rootFolder.tryGetFolder(path);
+        }
         load(name);
     }
-    
+
     /**
      * Load.
      *
diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java
index 607f0b5f706..bf04c69ce26 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java
@@ -353,7 +353,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
      * 
      * @return generic type of items
      */
-    public Class<T> getGenericType() { 
+    public Class<T> getGenericType() {
         return this.genericType;
     }
 
@@ -407,7 +407,6 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
      */
     public void setPool(final ItemPool<T> poolView, boolean infinite) {
         this.setPoolImpl(ItemPool.createFrom(poolView, this.genericType), infinite);
-
     }
 
     public void setPool(final ItemPool<T> pool0) {
@@ -1046,7 +1045,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
     public Iterable<ListSelectionListener> getSelectionListeners() {
     	return selectionListeners;
     }
-    
+
     public void setItemActivateCommand(Command itemActivateCommand0) {
         this.itemActivateCommand = itemActivateCommand0;
     }