added tokenizer, cleanup