Spark Integration: Addressed comments PR1