improve Tokens::clearEmptyTokens