Add more formatting niceties