Cleanup, especially of list display function.