Some repository cleanup
Working on the tokenizer