Slightly modified the comment tags to have a better representation.