Refactoring of the add comment section