Tidy token store creation