Simple comment refactoring