Comment Refactoring