refactor Comments