yet another comment refactoring