Refactoring on comments page