This looks way better. Shall we do the same for spark.dart as well?