Refactor Comments