[CB] -- fixed regex string, cleaned up finals