Clean up debug output a bit, get rid of per-hour measurements