diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/StreamProxy.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/StreamProxy.java
index df5f21bf..61145d0d 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/StreamProxy.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/StreamProxy.java
@@ -1,7 +1,5 @@
 package org.moire.ultrasonic.util;
 
-import timber.log.Timber;
-
 import org.moire.ultrasonic.domain.MusicDirectory;
 import org.moire.ultrasonic.service.DownloadFile;
 import org.moire.ultrasonic.service.Supplier;
@@ -22,6 +20,8 @@ import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.util.StringTokenizer;
 
+import timber.log.Timber;
+
 public class StreamProxy implements Runnable
 {
 	private Thread thread;
@@ -101,58 +101,58 @@ public class StreamProxy implements Runnable
 		Timber.i("Proxy interrupted. Shutting down.");
 	}
 
-    private class StreamToMediaPlayerTask implements Runnable {
-        String localPath;
-        Socket client;
-        int cbSkip;
+	private class StreamToMediaPlayerTask implements Runnable {
+		String localPath;
+		Socket client;
+		int cbSkip;
 
-        StreamToMediaPlayerTask(Socket client) {
-            this.client = client;
-        }
+		StreamToMediaPlayerTask(Socket client) {
+			this.client = client;
+		}
 
-        private String readRequest() {
-            InputStream is;
-            String firstLine;
-            try {
-                is = client.getInputStream();
-                BufferedReader reader = new BufferedReader(new InputStreamReader(is), 8192);
-                firstLine = reader.readLine();
-            } catch (IOException e) {
-                Timber.e(e, "Error parsing request");
-                return null;
-            }
+		private String readRequest() {
+			InputStream is;
+			String firstLine;
+			try {
+				is = client.getInputStream();
+				BufferedReader reader = new BufferedReader(new InputStreamReader(is), 8192);
+				firstLine = reader.readLine();
+			} catch (IOException e) {
+				Timber.e(e, "Error parsing request");
+				return null;
+			}
 
-            if (firstLine == null) {
-                Timber.i("Proxy client closed connection without a request.");
-                return null;
-            }
+			if (firstLine == null) {
+				Timber.i("Proxy client closed connection without a request.");
+				return null;
+			}
 
-            StringTokenizer st = new StringTokenizer(firstLine);
-            st.nextToken(); // method
-            String uri = st.nextToken();
-            String realUri = uri.substring(1);
-            Timber.i(realUri);
+			StringTokenizer st = new StringTokenizer(firstLine);
+			st.nextToken(); // method
+			String uri = st.nextToken();
+			String realUri = uri.substring(1);
+			Timber.i(realUri);
 
-            return realUri;
-        }
+			return realUri;
+		}
 
-        boolean processRequest() {
-            final String uri = readRequest();
-            if (uri == null || uri.isEmpty()) {
-                return false;
-            }
+		boolean processRequest() {
+			final String uri = readRequest();
+			if (uri == null || uri.isEmpty()) {
+				return false;
+			}
 
-            // Read HTTP headers
-            Timber.i("Processing request: %s", uri);
+			// Read HTTP headers
+			Timber.i("Processing request: %s", uri);
 
-            try {
-                localPath = URLDecoder.decode(uri, Constants.UTF_8);
-            } catch (UnsupportedEncodingException e) {
-                Timber.e(e, "Unsupported encoding");
-                return false;
-            }
+			try {
+				localPath = URLDecoder.decode(uri, Constants.UTF_8);
+			} catch (UnsupportedEncodingException e) {
+				Timber.e(e, "Unsupported encoding");
+				return false;
+			}
 
-            Timber.i("Processing request for file %s", localPath);
+			Timber.i("Processing request for file %s", localPath);
 			if (Storage.INSTANCE.isPathExists(localPath)) return true;
 
 			// Usually the .partial file will be requested here, but sometimes it has already