Improve the presentation