Add comment text refactorings