Added comment class. Minor code cleanup.