A few tweaks to improve the output format