refactor(clb): reorganizing lookup