Refactoring of the comments section