#40 Reorganize KeywordToken