Refactored CommentManager