Refactoring some comments functions

Refactoring some comments functions