refactor(clb): better parsing and more organized