Comment's refactoring