Tweaked the output format a bit.