|| refactoring
|| fix a bug for token drawing
|| better renaming refactoring function