Refactoring Comments