Tweaked output format a little bit