Clean up Template
Prepare testing of Tokenizer. Also provide some default options, clean up some code.