diff --git a/build.gradle b/build.gradle
index be620a418fc0..3515087295f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -158,7 +158,6 @@ task generateWPConfig(group: "generate", description: "Generate Config class") {
 package org.wordpress.android;
 
 public final class Config {
-
 ${config}
 }
 """)
diff --git a/src/org/wordpress/android/ui/accounts/WelcomeFragmentSignIn.java b/src/org/wordpress/android/ui/accounts/WelcomeFragmentSignIn.java
index a246f4670ee4..017e96f128c2 100644
--- a/src/org/wordpress/android/ui/accounts/WelcomeFragmentSignIn.java
+++ b/src/org/wordpress/android/ui/accounts/WelcomeFragmentSignIn.java
@@ -205,7 +205,7 @@ public void onClick(View v) {
             if (mSelfHosted && !TextUtils.isEmpty(EditTextUtils.getText(mUrlEditText).trim())) {
                 baseUrl = EditTextUtils.getText(mUrlEditText).trim();
                 String lowerCaseBaseUrl = baseUrl.toLowerCase(Locale.getDefault());
-                if (!lowerCaseBaseUrl.startsWith("https://")&& !lowerCaseBaseUrl.startsWith("http://")) {
+                if (!lowerCaseBaseUrl.startsWith("https://") && !lowerCaseBaseUrl.startsWith("http://")) {
                     baseUrl = "http://" + baseUrl;
                 }
             }
diff --git a/tools/compare-with-develop-style.sh b/tools/compare-with-develop-style.sh
index eb533ef471b0..f9464da59959 100755
--- a/tools/compare-with-develop-style.sh
+++ b/tools/compare-with-develop-style.sh
@@ -8,25 +8,25 @@ current_branch=$(git rev-parse --abbrev-ref HEAD)
 current_branch_filtered=$(echo $current_branch | tr "/" "-")
 
 # save local changes if any
-git stash | grep "No local changes to save" > /dev/null
-needpop=$?
 
-modified_files=$(git --no-pager diff develop --name-only)
+modified_files=$(git --no-pager diff develop --name-only | grep ".java$")
 
 # Check style on current branch
-checkstyle -c ../cq-configs/checkstyle/checkstyle.xml $modified_files > /tmp/checkstyle-$current_branch_filtered.log
+checkstyle -c cq-configs/checkstyle/checkstyle.xml $modified_files > /tmp/checkstyle-$current_branch_filtered.log
 
 # Check style on current develop
+git stash | grep "No local changes to save" > /dev/null
+needpop=$?
 git checkout $compared_branch
-checkstyle -c ../cq-configs/checkstyle/checkstyle.xml $modified_files > /tmp/checkstyle-develop.log
+checkstyle -c cq-configs/checkstyle/checkstyle.xml $modified_files > /tmp/checkstyle-develop.log
 
+# Back on current branch
 git checkout $current_branch
 
 echo
 echo --------------------------
 echo The following warnings seem to be introduced by your branch:
-diff -u /tmp/checkstyle-$current_branch_filtered.log \
-     /tmp/checkstyle-develop.log | grep "^+" | grep -v "^+++"
+diff -u /tmp/checkstyle-develop.log /tmp/checkstyle-$current_branch_filtered.log | grep "^+" | grep -v "^+++"
 
 # restore local changes
 if [ $needpop -eq 1 ]; then