diff --git a/.gitignore b/.gitignore
index 858115b9..172bedd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 
 .idea/*
 !.idea/codeStyles/
-sample_client/.idea/*
 
 # files for the dex VM
 *.dex
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
index 7d1a4409..e332b8fa 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -103,7 +103,7 @@ public class OwnCloudClient extends HttpClient {
     }
 
     public int executeHttpMethod(HttpBaseMethod method) throws Exception {
-        if(mSynchronizeRequests) {
+        if (mSynchronizeRequests) {
             synchronized (mRequestMutex) {
                 return saveExecuteHttpMethod(method);
             }
@@ -116,7 +116,7 @@ public class OwnCloudClient extends HttpClient {
         int repeatCounter = 0;
         int status;
 
-        if(mFollowRedirects) {
+        if (mFollowRedirects) {
             method.setFollowRedirects(true);
         }
 
@@ -139,7 +139,7 @@ public class OwnCloudClient extends HttpClient {
 
             if (shouldConnectionValidatorBeCalled(method, status)) {
                 retry = mConnectionValidator.validate(this, mSingleSessionManager, getContext()); // retry on success fail on no success
-            } else if(method.getFollowPermanentRedirects() && status == HTTP_MOVED_PERMANENTLY) {
+            } else if (method.getFollowPermanentRedirects() && status == HTTP_MOVED_PERMANENTLY) {
                 retry = true;
                 method.setFollowRedirects(true);
             }
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java
index 241a50fa..20539413 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java
@@ -31,7 +31,6 @@ import com.owncloud.android.lib.common.network.NetworkUtils;
 import okhttp3.Cookie;
 import okhttp3.CookieJar;
 import okhttp3.HttpUrl;
-import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
 import okhttp3.TlsVersion;
@@ -61,7 +60,7 @@ public class HttpClient {
     private OkHttpClient mOkHttpClient = null;
 
     protected HttpClient(Context context) {
-        if(context == null) {
+        if (context == null) {
             Timber.e("Context may not be NULL!");
             throw new NullPointerException("Context may not be NULL!");
         }