made bitvector tokenization consolidated