First pass at cleaning up comment list
2nd pass at cleaning up comment list
3rd pass at cleaning up comment list