Did a lot improvements to make better use of comment type.