diff --git a/hudi-cli/src/main/scala/org/apache/hudi/cli/DedupeSparkJob.scala b/hudi-cli/src/main/scala/org/apache/hudi/cli/DedupeSparkJob.scala
index c9966c26f..f40501a91 100644
--- a/hudi-cli/src/main/scala/org/apache/hudi/cli/DedupeSparkJob.scala
+++ b/hudi-cli/src/main/scala/org/apache/hudi/cli/DedupeSparkJob.scala
@@ -60,7 +60,7 @@ class DedupeSparkJob(basePath: String,
       group by `${HoodieRecord.RECORD_KEY_METADATA_FIELD}`
       having dupe_cnt > 1
       """
-    return sqlContext.sql(dupeSql)
+    sqlContext.sql(dupeSql)
   }
 
 
@@ -122,7 +122,7 @@ class DedupeSparkJob(basePath: String,
         }
       })
     })
-    return fileToDeleteKeyMap
+    fileToDeleteKeyMap
   }
 
 
diff --git a/hudi-spark/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala b/hudi-spark/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala
index 122aeabb5..af19e28b0 100644
--- a/hudi-spark/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala
+++ b/hudi-spark/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala
@@ -113,7 +113,7 @@ private[hudi] object HoodieSparkSqlWriter {
       }
       if (mode == SaveMode.Ignore && exists) {
         log.warn(s"hoodie dataset at $basePath already exists. Ignoring & not performing actual writes.")
-        return (true, common.util.Option.empty())
+        (true, common.util.Option.empty())
       }
       if (mode == SaveMode.Overwrite && exists) {
         log.warn(s"hoodie dataset at $basePath already exists. Deleting existing data & overwriting with new data.")
@@ -144,7 +144,7 @@ private[hudi] object HoodieSparkSqlWriter {
 
       if (hoodieRecords.isEmpty()) {
         log.info("new batch has no new records, skipping...")
-        return (true, common.util.Option.empty())
+        (true, common.util.Option.empty())
       }
       client.startCommitWithTime(commitTime)
       writeStatuses = DataSourceUtils.doWriteOperation(client, hoodieRecords, commitTime, operation)
diff --git a/style/scalastyle.xml b/style/scalastyle.xml
index 7ad1d5ed6..fa2c4d314 100644
--- a/style/scalastyle.xml
+++ b/style/scalastyle.xml
@@ -72,7 +72,7 @@
  </check>
  <check level="error" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="true"/>
  <check level="error" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"/>
- <check level="error" class="org.scalastyle.scalariform.ReturnChecker" enabled="false"/>
+ <check level="error" class="org.scalastyle.scalariform.ReturnChecker" enabled="true"/>
  <check level="error" class="org.scalastyle.scalariform.NullChecker" enabled="false"/>
  <check level="error" class="org.scalastyle.scalariform.NoCloneChecker" enabled="true"/>
  <check level="error" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"/>