Added separators to spark
tweaked and cleaned up