Add tokenizer, clean views