Tweak output to be nicer