Added seperate scanner for braces
Integrated brace tokenization