index identifiers better