diff --git a/src/de/mas/wiiu/jnus/NUSTitle.java b/src/de/mas/wiiu/jnus/NUSTitle.java
index 75104df..7cab5f0 100644
--- a/src/de/mas/wiiu/jnus/NUSTitle.java
+++ b/src/de/mas/wiiu/jnus/NUSTitle.java
@@ -25,7 +25,6 @@ import java.util.stream.Stream;
 
 import de.mas.wiiu.jnus.entities.TMD;
 import de.mas.wiiu.jnus.entities.Ticket;
-import de.mas.wiiu.jnus.entities.content.Content;
 import de.mas.wiiu.jnus.entities.fst.FST;
 import de.mas.wiiu.jnus.entities.fst.FSTEntry;
 import de.mas.wiiu.jnus.interfaces.NUSDataProvider;
diff --git a/src/de/mas/wiiu/jnus/NUSTitleConfig.java b/src/de/mas/wiiu/jnus/NUSTitleConfig.java
index 7099b07..b68bbcb 100644
--- a/src/de/mas/wiiu/jnus/NUSTitleConfig.java
+++ b/src/de/mas/wiiu/jnus/NUSTitleConfig.java
@@ -23,5 +23,5 @@ import lombok.Data;
 public class NUSTitleConfig {
     private Ticket ticket;
     private boolean noDecryption;
-    private byte[] commonKey; 
+    private byte[] commonKey;
 }
diff --git a/src/de/mas/wiiu/jnus/NUSTitleLoaderLocalBackup.java b/src/de/mas/wiiu/jnus/NUSTitleLoaderLocalBackup.java
index b7f3b1a..95a30cf 100644
--- a/src/de/mas/wiiu/jnus/NUSTitleLoaderLocalBackup.java
+++ b/src/de/mas/wiiu/jnus/NUSTitleLoaderLocalBackup.java
@@ -25,6 +25,7 @@ public final class NUSTitleLoaderLocalBackup {
     private NUSTitleLoaderLocalBackup() {
 
     }
+
     public static NUSTitle loadNUSTitle(String inputPath, short titleVersion, Ticket ticket) throws Exception {
         NUSTitleConfig config = new NUSTitleConfig();
 
diff --git a/src/de/mas/wiiu/jnus/entities/TMD.java b/src/de/mas/wiiu/jnus/entities/TMD.java
index a3db0ca..9b13fe2 100644
--- a/src/de/mas/wiiu/jnus/entities/TMD.java
+++ b/src/de/mas/wiiu/jnus/entities/TMD.java
@@ -104,7 +104,7 @@ public final class TMD {
     public static TMD parseTMD(File tmd) throws IOException, ParseException {
         if (tmd == null || !tmd.exists()) {
             log.info("TMD input file null or doesn't exist.");
-            throw new   IOException("TMD input file null or doesn't exist.");
+            throw new IOException("TMD input file null or doesn't exist.");
         }
         return parseTMD(Files.readAllBytes(tmd.toPath()));
     }
@@ -145,7 +145,7 @@ public final class TMD {
         buffer.position(0x184);
         long systemVersion = buffer.getLong();
         long titleID = buffer.getLong();
-        if((titleID & 0x0005000000000000L) != 0x0005000000000000L) {
+        if ((titleID & 0x0005000000000000L) != 0x0005000000000000L) {
             throw new ParseException("Invalid TMD file. This is not a Wii U TMD", 0);
         }
         int titleType = buffer.getInt();
diff --git a/src/de/mas/wiiu/jnus/entities/content/Content.java b/src/de/mas/wiiu/jnus/entities/content/Content.java
index 5cd33d5..ac2a645 100644
--- a/src/de/mas/wiiu/jnus/entities/content/Content.java
+++ b/src/de/mas/wiiu/jnus/entities/content/Content.java
@@ -18,16 +18,12 @@ package de.mas.wiiu.jnus.entities.content;
 
 import java.nio.ByteBuffer;
 import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 import de.mas.wiiu.jnus.Settings;
-import de.mas.wiiu.jnus.entities.fst.FSTEntry;
 import de.mas.wiiu.jnus.utils.Utils;
 import lombok.Data;
 import lombok.Getter;
-import lombok.Setter;
 import lombok.extern.java.Log;
 
 /**
diff --git a/src/de/mas/wiiu/jnus/entities/content/ContentFSTInfo.java b/src/de/mas/wiiu/jnus/entities/content/ContentFSTInfo.java
index 42f7d90..a80de8f 100644
--- a/src/de/mas/wiiu/jnus/entities/content/ContentFSTInfo.java
+++ b/src/de/mas/wiiu/jnus/entities/content/ContentFSTInfo.java
@@ -55,7 +55,7 @@ public final class ContentFSTInfo {
      * @param input
      *            0x20 byte of data from the FST (starting at 0x20)
      * @return ContentFSTInfo object
-     * @throws ParseException 
+     * @throws ParseException
      */
     public static ContentFSTInfo parseContentFST(byte[] input) throws ParseException {
         if (input == null || input.length != 0x20) {
diff --git a/src/de/mas/wiiu/jnus/implementations/NUSDataProviderFST.java b/src/de/mas/wiiu/jnus/implementations/NUSDataProviderFST.java
index 31b2c56..ee7835e 100644
--- a/src/de/mas/wiiu/jnus/implementations/NUSDataProviderFST.java
+++ b/src/de/mas/wiiu/jnus/implementations/NUSDataProviderFST.java
@@ -56,8 +56,8 @@ public class NUSDataProviderFST implements NUSDataProvider {
     @Override
     public Optional<byte[]> getContentH3Hash(Content content) throws IOException {
         Optional<byte[]> res = h3Hashes.get(content.getID());
-        if(res == null) {
-            res =readFileByFilename(base, String.format("%08X%s", content.getID(), Settings.H3_EXTENTION));
+        if (res == null) {
+            res = readFileByFilename(base, String.format("%08X%s", content.getID(), Settings.H3_EXTENTION));
             h3Hashes.put(content.getID(), res);
         }
         return res;
diff --git a/src/de/mas/wiiu/jnus/interfaces/NUSDataProvider.java b/src/de/mas/wiiu/jnus/interfaces/NUSDataProvider.java
index 2961dcc..edc10fd 100644
--- a/src/de/mas/wiiu/jnus/interfaces/NUSDataProvider.java
+++ b/src/de/mas/wiiu/jnus/interfaces/NUSDataProvider.java
@@ -26,7 +26,6 @@ import de.mas.wiiu.jnus.entities.fst.FST;
 import de.mas.wiiu.jnus.utils.StreamUtils;
 
 public interface NUSDataProvider {
-
     default public byte[] readContent(Content content, long offset, int size) throws IOException {
         return StreamUtils.getBytesFromStream(readContentAsStream(content, offset, size), size);
     }
diff --git a/src/de/mas/wiiu/jnus/utils/ByteArrayWrapper.java b/src/de/mas/wiiu/jnus/utils/ByteArrayWrapper.java
index 24ef546..6d91cc1 100644
--- a/src/de/mas/wiiu/jnus/utils/ByteArrayWrapper.java
+++ b/src/de/mas/wiiu/jnus/utils/ByteArrayWrapper.java
@@ -23,7 +23,7 @@ import lombok.NonNull;
 public final class ByteArrayWrapper {
     private final byte[] data;
 
-    public ByteArrayWrapper(@NonNull byte[] data) {       
+    public ByteArrayWrapper(@NonNull byte[] data) {
         this.data = data;
     }
 
diff --git a/src/de/mas/wiiu/jnus/utils/StreamUtils.java b/src/de/mas/wiiu/jnus/utils/StreamUtils.java
index a1a48dd..dd4af30 100644
--- a/src/de/mas/wiiu/jnus/utils/StreamUtils.java
+++ b/src/de/mas/wiiu/jnus/utils/StreamUtils.java
@@ -34,8 +34,8 @@ public final class StreamUtils {
     }
 
     /**
-     * Tries to read a given amount of bytes from a stream and return them as 
-     * a byte array. Closes the inputs stream on success AND failure.
+     * Tries to read a given amount of bytes from a stream and return them as a byte array. Closes the inputs stream on success AND failure.
+     * 
      * @param in
      * @param size
      * @return
diff --git a/src/de/mas/wiiu/jnus/utils/Utils.java b/src/de/mas/wiiu/jnus/utils/Utils.java
index a736991..6e7e4be 100644
--- a/src/de/mas/wiiu/jnus/utils/Utils.java
+++ b/src/de/mas/wiiu/jnus/utils/Utils.java
@@ -179,7 +179,7 @@ public final class Utils {
             return 0L;
         }
     }
-    
+
     public static void setGlobalLogLevel(Level level) {
         Arrays.stream(LogManager.getLogManager().getLogger("").getHandlers()).forEach(h -> h.setLevel(level));
     }
diff --git a/src/de/mas/wiiu/jnus/utils/download/NUSDownloadService.java b/src/de/mas/wiiu/jnus/utils/download/NUSDownloadService.java
index 0f27fd1..d256191 100644
--- a/src/de/mas/wiiu/jnus/utils/download/NUSDownloadService.java
+++ b/src/de/mas/wiiu/jnus/utils/download/NUSDownloadService.java
@@ -23,7 +23,6 @@ import java.net.URL;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 
 import de.mas.wiiu.jnus.Settings;