Tokenizer is now a function
Added basic tokenizer
Minor formatting
Added more tokenizers