fixed some indenting bug and some tokens disappeared