Listing/comments page cleanup