Comments refactoring.