Tidy up list handling
Add comments. Remove 172 character limit now we're not recursing.
Strip comments