Restructured spark for more clarity.