Tidy up output a little bit