refactor from comment to Comment