Tidy up the output according to task