clean up cabs single code