Make identifier function more explicit