Refactoring comment modules