Do some better formatting