Full refactoring of CommentBundle