SPARK-3688 fix code style