Cosmetic tweaks to output