Tweaked output to play nicely with the command line