Fix the intendation level of if-statement without curly brackets
Make tokenizer a singleton