Added code for Comments refactoring