Refactoring of Comments task