diff --git a/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java b/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
index c68262df..2ed84a57 100644
--- a/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
+++ b/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
@@ -25,7 +25,6 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -35,9 +34,6 @@ import com.google.android.gms.appindexing.Action;
 import com.google.android.gms.appindexing.AppIndex;
 import com.google.android.gms.common.api.GoogleApiClient;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.Vector;
 
 import de.badaix.snapcast.control.ClientInfo;
diff --git a/android/Snapcast/src/main/java/de/badaix/snapcast/SnapclientService.java b/android/Snapcast/src/main/java/de/badaix/snapcast/SnapclientService.java
index cf2bece5..76b6ffee 100644
--- a/android/Snapcast/src/main/java/de/badaix/snapcast/SnapclientService.java
+++ b/android/Snapcast/src/main/java/de/badaix/snapcast/SnapclientService.java
@@ -35,6 +35,7 @@ public class SnapclientService extends Service {
         void onPlayerStop(SnapclientService snapclientService);
 
         void onLog(SnapclientService snapclientService, String log);
+
         void onError(SnapclientService snapclientService, String msg, Exception exception);
     }
 
diff --git a/android/Snapcast/src/main/java/de/badaix/snapcast/control/Stream.java b/android/Snapcast/src/main/java/de/badaix/snapcast/control/Stream.java
index 7f9a7dee..242cbde0 100644
--- a/android/Snapcast/src/main/java/de/badaix/snapcast/control/Stream.java
+++ b/android/Snapcast/src/main/java/de/badaix/snapcast/control/Stream.java
@@ -7,7 +7,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -46,7 +45,7 @@ public class Stream implements JsonSerialisable {
         fragment = in.readString();
         id = in.readString();
         Bundle bundle = in.readBundle();
-        query = (HashMap<String, String>)bundle.getSerializable("query");
+        query = (HashMap<String, String>) bundle.getSerializable("query");
     }
 
     @Override
@@ -60,7 +59,7 @@ public class Stream implements JsonSerialisable {
             id = json.getString("id");
             query = new HashMap<>();
             JSONObject jQuery = json.getJSONObject("query");
-            for(int i = 0; i<jQuery.names().length(); i++)
+            for (int i = 0; i < jQuery.names().length(); i++)
                 query.put(jQuery.names().getString(i), jQuery.getString(jQuery.names().getString(i)));
         } catch (JSONException e) {
             e.printStackTrace();
@@ -98,7 +97,8 @@ public class Stream implements JsonSerialisable {
         if (scheme != null ? !scheme.equals(stream.scheme) : stream.scheme != null) return false;
         if (host != null ? !host.equals(stream.host) : stream.host != null) return false;
         if (path != null ? !path.equals(stream.path) : stream.path != null) return false;
-        if (fragment != null ? !fragment.equals(stream.fragment) : stream.fragment != null) return false;
+        if (fragment != null ? !fragment.equals(stream.fragment) : stream.fragment != null)
+            return false;
         if (id != null ? !id.equals(stream.id) : stream.id != null) return false;
         return !(query != null ? !query.equals(stream.query) : stream.query != null);
     }