Address review comments
Remove stray debugging code
Polymerize and optimize spark-status a little