Add some better formatting