Formatting
Refactor Tokenizer slightly