Checking uniqueness of matching tokens; Additional cosmetic changes