Refactor CBM