Improve the output list