CommentHandler refactoring