Refactor TokenElement class
Merge pull request #276 from takahi-i/refactor-token-element

Refactor TokenElement class