refactoring Comment API