More line-comment improvements.
Refactored commenting into function to enable testing.