I am definitely ok with leaving it as is. Since Spark code already have mixed of these styles anyway so lets keep it as if.
There are so much code to be reviewed =)