Refactoring. Adding new Comments