SPARK-3278 scalastyle errors resolved