Refactoring comments integration.