Improve the presentation in list. #1