Tidying up the output