Switch to a list for display
Improve commenting