Fit most of spark.dart into 80-char width
Merge pull request #3369 from ussuri/small-fixes-3

Fit most of spark.dart into 80-char width