Update for cleaner extraction of ident str