Cleanup whitespace in the tokenizer
Align some things in the tokenizer for easier reading