multiple comment refactoring