Clean up code to match Spark