Fixing to match Spark styleguide